[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#67072] [PATCH v2 2/4] challenge: Use the same substitute URLs as gu
From: |
Ludovic Courtès |
Subject: |
[bug#67072] [PATCH v2 2/4] challenge: Use the same substitute URLs as guix-daemon. |
Date: |
Mon, 4 Dec 2023 15:15:43 +0100 |
* 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 @@ (define %options
(define %default-options
`((system . ,(%current-system))
- (substitute-urls . ,%default-substitute-urls)
(difference-report . ,report-differing-files)))
@@ -539,7 +538,13 @@ (define-command (guix-challenge . args)
(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)
--
2.41.0
- [bug#67072] [PATCH 4/4] weather: Report unauthorized substitute servers., Ludovic Courtès, 2023/12/02
- [bug#67072] [PATCH 4/4] weather: Report unauthorized substitute servers., Simon Tournier, 2023/12/02
- [bug#67072] [PATCH v2 4/4] weather: Report unauthorized substitute servers., Ludovic Courtès, 2023/12/04
- [bug#67072] [PATCH v2 1/4] daemon: Implement ‘substitute-urls’ RPC., Ludovic Courtès, 2023/12/04
- [bug#67072] [PATCH v2 3/4] weather: Use the same substitute URLs as guix-daemon., Ludovic Courtès, 2023/12/04
- [bug#67072] [PATCH v2 2/4] challenge: Use the same substitute URLs as guix-daemon.,
Ludovic Courtès <=
- [bug#67072] [PATCH v2 0/4] Helping diagnose substitute setup issues, Ludovic Courtès, 2023/12/04