challenge: Disable grafting.
* guix/scripts/challenge.scm (guix-challenge): Set %GRAFT? to #f.
This commit is contained in:
parent
a7a3b39060
commit
db8f6b3412
|
@ -21,6 +21,7 @@
|
||||||
#:use-module (guix scripts)
|
#:use-module (guix scripts)
|
||||||
#:use-module (guix store)
|
#:use-module (guix store)
|
||||||
#:use-module (guix utils)
|
#:use-module (guix utils)
|
||||||
|
#:use-module (guix grafts)
|
||||||
#:use-module (guix monads)
|
#:use-module (guix monads)
|
||||||
#:use-module (guix base32)
|
#:use-module (guix base32)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
|
@ -222,23 +223,26 @@ Challenge the substitutes for PACKAGE... provided by one or more servers.\n"))
|
||||||
(urls (assoc-ref opts 'substitute-urls)))
|
(urls (assoc-ref opts 'substitute-urls)))
|
||||||
(leave-on-EPIPE
|
(leave-on-EPIPE
|
||||||
(with-store store
|
(with-store store
|
||||||
(let ((files (match files
|
;; Disable grafts since substitute servers normally provide only
|
||||||
(()
|
;; ungrafted stuff.
|
||||||
(filter (cut locally-built? store <>)
|
(parameterize ((%graft? #f))
|
||||||
(live-paths store)))
|
(let ((files (match files
|
||||||
(x
|
(()
|
||||||
files))))
|
(filter (cut locally-built? store <>)
|
||||||
(set-build-options store
|
(live-paths store)))
|
||||||
#:use-substitutes? #f)
|
(x
|
||||||
|
files))))
|
||||||
|
(set-build-options store
|
||||||
|
#:use-substitutes? #f)
|
||||||
|
|
||||||
(run-with-store store
|
(run-with-store store
|
||||||
(mlet* %store-monad ((items (mapm %store-monad
|
(mlet* %store-monad ((items (mapm %store-monad
|
||||||
ensure-store-item files))
|
ensure-store-item files))
|
||||||
(issues (discrepancies items urls)))
|
(issues (discrepancies items urls)))
|
||||||
(for-each summarize-discrepancy issues)
|
(for-each summarize-discrepancy issues)
|
||||||
(unless (null? issues)
|
(unless (null? issues)
|
||||||
(exit 2))
|
(exit 2))
|
||||||
(return (null? issues)))
|
(return (null? issues)))
|
||||||
#:system system)))))))
|
#:system system))))))))
|
||||||
|
|
||||||
;;; challenge.scm ends here
|
;;; challenge.scm ends here
|
||||||
|
|
Loading…
Reference in New Issue