02/02: store: Add preliminary support for client-supplied substitute URLs.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 41c45e78632978ab64dd7df50765c6adf443a249
Author: Ludovic Courtès <address@hidden>
Date:   Wed Mar 18 14:39:53 2015 +0100

    store: Add preliminary support for client-supplied substitute URLs.
    
    * guix/store.scm (set-build-options): Rename #:binary-caches to
      #:substitute-urls.  Actually pass it in 'pairs' under the
      "substitute-urls" key.
    * guix/scripts/substitute-binary.scm (%cache-url): Add comment for
      "untrusted-substitute-urls".
---
 guix/scripts/substitute-binary.scm |    7 ++++++-
 guix/store.scm                     |   12 ++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/guix/scripts/substitute-binary.scm 
b/guix/scripts/substitute-binary.scm
index 903564c..50e3db2 100755
--- a/guix/scripts/substitute-binary.scm
+++ b/guix/scripts/substitute-binary.scm
@@ -631,7 +631,12 @@ found."
   (assoc-ref (daemon-options) option))
 
 (define %cache-url
-  (match (and=> (find-daemon-option "substitute-urls")
+  (match (and=> (string-append
+                 ;; TODO: Uncomment the following lines when multiple
+                 ;; substitute sources are supported.
+                 ;; (find-daemon-option "untrusted-substitute-urls") ;client
+                 ;; " "
+                 (find-daemon-option "substitute-urls"))          ;admin
                 string-tokenize)
     ((url)
      url)
diff --git a/guix/store.scm b/guix/store.scm
index a3f3cbf..4c069b2 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -459,7 +459,7 @@ encoding conversion errors."
                             (print-build-trace #t)
                             (build-cores (current-processor-count))
                             (use-substitutes? #t)
-                            (binary-caches '())) ; client "untrusted" cache 
URLs
+                            (substitute-urls '())) ; client "untrusted" cache 
URLs
   ;; Must be called after `open-connection'.
 
   (define socket
@@ -484,11 +484,11 @@ encoding conversion errors."
     (when (>= (nix-server-minor-version server) 10)
       (send (boolean use-substitutes?)))
     (when (>= (nix-server-minor-version server) 12)
-      (let ((pairs (if timeout
-                       `(("build-timeout" . ,(number->string timeout))
-                         ,@binary-caches)
-                       binary-caches)))
-        (send (string-pairs pairs))))
+      (let ((pairs `(,@(if timeout
+                           `(("build-timeout" . ,(number->string timeout)))
+                           '())
+                     ("substitute-urls" . ,(string-join substitute-urls)))))
+        (send (string-pairs (pk 'pairs pairs)))))
     (let loop ((done? (process-stderr server)))
       (or done? (process-stderr server)))))