03/05: lint: 'check-derivation' fully disables grafts.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 40bbcaa65d90a8c869d9732af26cb6ceb8e81ca8
Author: Ludovic Courtès <address@hidden>
Date:   Tue Nov 20 18:28:34 2018 +0100

    lint: 'check-derivation' fully disables grafts.
    
    Previously grafting could take place indirectly, for instance when
    lowering origins.
    
    * guix/scripts/lint.scm (check-derivation)[try]: Parameterize
    '%graft?'.
---
 guix/scripts/lint.scm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
index e8cf2dc..2314f3b 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -33,6 +33,7 @@
   #:use-module (guix packages)
   #:use-module (guix licenses)
   #:use-module (guix records)
+  #:use-module (guix grafts)
   #:use-module (guix ui)
   #:use-module (guix upstream)
   #:use-module (guix utils)
@@ -789,15 +790,16 @@ descriptions maintained upstream."
                                          (condition-message c)))))
           (with-store store
             ;; Disable grafts since it can entail rebuilds.
-            (package-derivation store package system #:graft? #f)
-
-            ;; If there's a replacement, make sure we can compute its
-            ;; derivation.
-            (match (package-replacement package)
-              (#f #t)
-              (replacement
-               (package-derivation store replacement system
-                                   #:graft? #f))))))
+            (parameterize ((%graft? #f))
+              (package-derivation store package system #:graft? #f)
+
+              ;; If there's a replacement, make sure we can compute its
+              ;; derivation.
+              (match (package-replacement package)
+                (#f #t)
+                (replacement
+                 (package-derivation store replacement system
+                                     #:graft? #f)))))))
       (lambda args
         (emit-warning package
                       (format #f (G_ "failed to create ~a derivation: ~s")