From patchwork Sat Nov 11 11:06:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 56259 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 48F0527BBEA; Sat, 11 Nov 2023 11:14:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C0A5C27BBE2 for ; Sat, 11 Nov 2023 11:14:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1lwX-0004Us-So; Sat, 11 Nov 2023 06:14:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r1lwV-0004US-DA for guix-patches@gnu.org; Sat, 11 Nov 2023 06:14:23 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r1lwV-0002FD-4J; Sat, 11 Nov 2023 06:14:23 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r1lx8-0005oa-Ab; Sat, 11 Nov 2023 06:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67072] [PATCH 2/4] challenge: Use the same substitute URLs as guix-daemon. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sat, 11 Nov 2023 11:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67072 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67072@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 67072-submit@debbugs.gnu.org id=B67072.169970127122272 (code B ref 67072); Sat, 11 Nov 2023 11:15:02 +0000 Received: (at 67072) by debbugs.gnu.org; 11 Nov 2023 11:14:31 +0000 Received: from localhost ([127.0.0.1]:52177 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1lwd-0005n9-BF for submit@debbugs.gnu.org; Sat, 11 Nov 2023 06:14:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44210) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1lwV-0005mQ-Jx for 67072@debbugs.gnu.org; Sat, 11 Nov 2023 06:14:27 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r1lvl-000266-M2; Sat, 11 Nov 2023 06:13:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=tr4GCLXY9vCKCXMkzWp2PiyLagQtaTOJotynNo9MsX0=; b=G45BJ+aNXEPFe0NTmCzN 9lh2jvfg5Hofb90BrxHihju7vW2819mGhzXvaHgJUV82mPbV6XBO9KiEyjq4b8NV+tLbmJ8iaRhci W0FTMgZHoL05ijAFGdBGVYcf/YhzDeAKzXt2bxlrNYsA31m7G7H+atUFc7+c10OY2d2hQt/A2esvG 4FVIMMVYwMVMIS5G6NTyyhGEqEZ/B7QpAlswboBv97Ob9dz68aq0Qxpete4HOMYpUdrceAXBXlhQf IkxkGDiBcK/tAcCH3Rnw4ZrC2WUrDz1tWWz8o5b90ffSCIDb5wejIcqfFgpnjEsD6pfvAaP98V5Cb eXX+iir77/uTEw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sat, 11 Nov 2023 12:06:24 +0100 Message-ID: <9ff92e8db2d452552712ec53b095ac74a070bc23.1699700049.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 +;;; Copyright © 2015-2017, 2019-2023 Ludovic Courtès ;;; ;;; 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)