me
/
guix
Archived
1
0
Fork 0

weather: Parameterize '%graft?' upfront.

* guix/scripts/weather.scm (guix-weather): Parameterize %GRAFT? upfront.
master
Ludovic Courtès 2020-03-05 16:09:52 +01:00
parent f42f39ad68
commit e7671685a8
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 12 additions and 8 deletions

View File

@ -500,7 +500,12 @@ SERVER. Display information for packages with at least THRESHOLD dependents."
(if file (load-manifest file) '())))))
(with-error-handling
(parameterize ((current-terminal-columns (terminal-columns)))
(parameterize ((current-terminal-columns (terminal-columns))
;; Set grafting upfront in case the user's input depends on
;; it (e.g., a manifest or code snippet that calls
;; 'gexp->derivation').
(%graft? #f))
(let* ((opts (parse-command-line args %options
(list %default-options)
#:build-options? #f))
@ -513,13 +518,12 @@ SERVER. Display information for packages with at least THRESHOLD dependents."
(systems systems)))
(packages (package-list opts))
(items (with-store store
(parameterize ((%graft? #f))
(concatenate
(run-with-store store
(mapm %store-monad
(lambda (system)
(package-outputs packages system))
systems)))))))
(concatenate
(run-with-store store
(mapm %store-monad
(lambda (system)
(package-outputs packages system))
systems))))))
(for-each (lambda (server)
(report-server-coverage server items)
(match (assoc-ref opts 'coverage)