nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui: Don't make substituter-related RPCs at all when substitutes are disabled. 

Reported by Nikita Karetnikov and Cyril Roelandt.

* guix/ui.scm (show-what-to-build): Call `substitutable-path-info'
  only when USE-SUBSTITUTES? is true.
master
Ludovic Courtès 2013-07-01 00:29:22 +02:00
parent a4572a1720
commit 1a8b783470
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
guix/ui.scm
View File

@ -223,12 +223,15 @@ available for download."
drv) drv)
(map derivation-input-path build)))) (map derivation-input-path build))))
((download) ; add the references of DOWNLOAD ((download) ; add the references of DOWNLOAD
(delete-duplicates (if use-substitutes?
(append download (delete-duplicates
(remove (cut valid-path? store <>) (append download
(append-map (remove (cut valid-path? store <>)
substitutable-references (append-map
(substitutable-path-info store download))))))) substitutable-references
(substitutable-path-info store
download)))))
download)))
(if dry-run? (if dry-run?
(begin (begin
(format (current-error-port) (format (current-error-port)