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

View File

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