From 0c357a088bb0b267df9d9bde486e6603f66cd029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 15 Apr 2013 23:42:42 +0200 Subject: [PATCH] substitute-binary: Call `open-cache' only when needed. * guix/scripts/substitute-binary.scm (lookup-narinfo): Force CACHE when passing it to `fetch-narinfo'. (guix-substitute-binary): Delay calls to `open-cache'. --- guix/scripts/substitute-binary.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/guix/scripts/substitute-binary.scm b/guix/scripts/substitute-binary.scm index 453a29a5ea..94cfac8bcc 100755 --- a/guix/scripts/substitute-binary.scm +++ b/guix/scripts/substitute-binary.scm @@ -306,7 +306,8 @@ check what it has." (values #f #f))))) (if valid? cached ; including negative caches - (let ((narinfo (fetch-narinfo cache path))) + (let ((narinfo (and=> (force cache) + (cut fetch-narinfo <> path)))) (with-atomic-file-output cache-file (lambda (out) (write (cache-entry narinfo) out))) @@ -351,7 +352,7 @@ through COMMAND. INPUT must be a file input port." (mkdir-p %narinfo-cache-directory) (match args (("--query") - (let ((cache (open-cache %cache-url))) + (let ((cache (delay (open-cache %cache-url)))) (let loop ((command (read-line))) (or (eof-object? command) (begin @@ -397,7 +398,7 @@ through COMMAND. INPUT must be a file input port." (loop (read-line))))))) (("--substitute" store-path destination) ;; Download STORE-PATH and add store it as a Nar in file DESTINATION. - (let* ((cache (open-cache %cache-url)) + (let* ((cache (delay (open-cache %cache-url))) (narinfo (lookup-narinfo cache store-path)) (uri (narinfo-uri narinfo))) ;; Tell the daemon what the expected hash of the Nar itself is.