04/10: challenge: Use the same substitute URLs as guix-daemon.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit f63a8c5ca20edbf8fad21542712554f38f544e9b
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Nov 10 23:16:33 2023 +0100

    challenge: Use the same substitute URLs as guix-daemon.
    
    * guix/scripts/challenge.scm (%default-options): Remove ‘substitute-urls’.
    (guix-challenge): Call ‘substitute-urls’ when OPTS doesn’t have it.  Warn
    when ‘substitute-urls’ returns #f.
    
    Change-Id: I49be0e89404c1889970a3430967fbb3498d35d99
---
 guix/scripts/challenge.scm | 11 ++++++++---
 1 file 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)