07/09: weather: Parameterize '%graft?' upfront.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit e7671685a882a2269718c3949b7f2cd995cb85e4
Author: Ludovic Courtès <address@hidden>
AuthorDate: Thu Mar 5 16:09:52 2020 +0100

    weather: Parameterize '%graft?' upfront.
    
    * guix/scripts/weather.scm (guix-weather): Parameterize %GRAFT? upfront.
---
 guix/scripts/weather.scm | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/guix/scripts/weather.scm b/guix/scripts/weather.scm
index 7bfa786..6298447 100644
--- a/guix/scripts/weather.scm
+++ b/guix/scripts/weather.scm
@@ -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)