diff options
author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-18 03:58:23 +0100 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-18 03:58:23 +0100 |
commit | 256d5b3598fa2162e9712fc98781d2cb4ceda31e (patch) | |
tree | 0e7f7051a59aad879561b5c4ee885e24d3c04bc6 /guix/scripts/challenge.scm | |
parent | 9f6210cc5c114310a38ad1cc0ff5900409a7e7cc (diff) | |
parent | 1a9f267f51f97b8ca7049aa72763ddd64aad5b62 (diff) |
Merge branch 'master' into wip-webkitwip-webkit
Diffstat (limited to 'guix/scripts/challenge.scm')
-rw-r--r-- | guix/scripts/challenge.scm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/guix/scripts/challenge.scm b/guix/scripts/challenge.scm index 01e2f9a2b2..d38171b868 100644 --- a/guix/scripts/challenge.scm +++ b/guix/scripts/challenge.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015-2017, 2019-2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015-2017, 2019-2023 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -504,7 +504,6 @@ Challenge the substitutes for PACKAGE... provided by one or more servers.\n")) (define %default-options `((system . ,(%current-system)) - (substitute-urls . ,%default-substitute-urls) (difference-report . ,report-differing-files))) @@ -539,7 +538,13 @@ Challenge the substitutes for PACKAGE... provided by one or more servers.\n")) (G_ "no arguments specified, nothing to do~%")) (exit 0)) (x - files)))) + files))) + (urls (or urls + (substitute-urls store) + (begin + (warning (G_ "could not determine current \ +substitute URLs; using defaults~%")) + %default-substitute-urls)))) (set-build-options store #:use-substitutes? #f) |