From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id sLaXBhdiT2VlygAAauVa8A:P1 (envelope-from ) for ; Sat, 11 Nov 2023 12:14:31 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id sLaXBhdiT2VlygAAauVa8A (envelope-from ) for ; Sat, 11 Nov 2023 12:14:31 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C5CE7164D8 for ; Sat, 11 Nov 2023 12:14:30 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gnu.org header.s=fencepost-gnu-org header.b=G45BJ+aN; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1699701271; a=rsa-sha256; cv=none; b=LKuEjgSiFhOWeOWKg+/0P5uIlDSj4geyPmCK9lQ9EanRh9a0JCS2ErrM42z/HIvdwj1WmY FG1ggvM05JS1rbkoY5MhYTw1Melxm1bJcxkygGZW/3um5dM8fGAgxaMgwzxNtHa4G4+N1C /RN6CYqU5B0PTvMts2gVN3G8P9svgcIefEZJKp1427nGLYA4T1Yev63NRPMbSS40P4lStO mdGbCkrAWLRnIfScBSdZLU6sl0+LZsxvocSsq4Q+h1El5HDbzPec2C9PBEeXr2aOjuh7Ud 539/awaXdrbzcLJ823cbfDo/+iBi2JclaInJ+7jNJLNBbkMdzVmVpTkPqzWuYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1699701271; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=yM5z61L4M5DO0hxjbuAwkHrO/Zhd04vjRQYB0Se3ujs=; b=NSemP9DTUvSTi4Ch6e9ZMdGB5KbrZMuwvcoy049WJY5T2igKYFWkiq70Xsi/29EtZRD9dY sByT5OVf1efb9Xqq78OT1IPtbgGoft2vMNtlSb2b6/xEuYyZHkDaP3Ed785CUud4zTtNwI nvDIjuTjnN1Zmi+KjJ9qHgcgCZG52T7goL97h6iEcSWiJFcLMXF3Sv3lS9YINzDcl3Lgd1 2VY3fi39peo1O6XHEhlMUu6osqNYVuBsr96ZUWY2J/GdrOgF6fsXVdfpS9fsRXcqGjjzg2 EydZbROXtqsn8gXq84hk2zQ69TGBkvgwCE6uGJ+JKAuh3qaZMprkbInLLjoZxQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gnu.org header.s=fencepost-gnu-org header.b=G45BJ+aN; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -4.31 X-Migadu-Queue-Id: C5CE7164D8 X-Migadu-Spam-Score: -4.31 X-TUID: HYowr2wBwx+5 * 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) -- 2.41.0