me
/
guix
Archived
1
0
Fork 0
Code

substitute-binary: Skip servers that use a different store prefix. 

* guix/scripts/substitute-binary.scm (fetch-narinfo): Return #f when
  CACHE uses a store directory different from (%store-prefix).
master
Ludovic Courtès 2013-04-15 23:27:04 +02:00
parent 0c357a088b
commit e967678ed1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
guix/scripts/substitute-binary.scm
View File

@ -257,10 +257,11 @@ reading PORT."
;; list of key/value pairs. ;; list of key/value pairs.
(false-if-exception (fetch (string->uri url)))) (false-if-exception (fetch (string->uri url))))
(and=> (download (string-append (cache-url cache) "/" (and (string=? (cache-store-directory cache) (%store-prefix))
(store-path-hash-part path) (and=> (download (string-append (cache-url cache) "/"
".narinfo")) (store-path-hash-part path)
(cute read-narinfo <> (cache-url cache)))) ".narinfo"))
(cute read-narinfo <> (cache-url cache)))))
(define (lookup-narinfo cache path) (define (lookup-narinfo cache path)
"Check locally if we have valid info about PATH, otherwise go to CACHE and "Check locally if we have valid info about PATH, otherwise go to CACHE and