From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id +Lt/DaeMSWfACQEAqHPOHw:P1 (envelope-from ) for ; Fri, 29 Nov 2024 09:43:03 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id +Lt/DaeMSWfACQEAqHPOHw (envelope-from ) for ; Fri, 29 Nov 2024 10:43:03 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="iFZMGbS/"; dkim=fail ("body hash did not verify") header.d=gnu.org header.s=fencepost-gnu-org header.b=B4HEUDS2; 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 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 D04175CCBB for ; Fri, 29 Nov 2024 10:43:02 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tGxWV-0000vf-Jx; Fri, 29 Nov 2024 04:42:51 -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 1tGxVm-0000ex-T5 for guix-patches@gnu.org; Fri, 29 Nov 2024 04:42:07 -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 1tGxVm-0004ZN-Gc; Fri, 29 Nov 2024 04:42:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=kl+o3JDOVclar88DBNdgoen9lS8pCWyJIdQt9A5uZV8=; b=iFZMGbS/lqKoxjKyUi4iL1j8gorGbB7+4RB1au15CUURDzG7pqVw7ExrRgIXkqHRnlYd2xYTQ5rljFmgsBZXW3Vht+ugUMiubu8I4Wd/c6xYolBh0ej7rEKkYL6CYb6GTYPk1GgVrxcISbyenUDd2jScrdK9+3B79geK+dF6NPD+LiPnPrn+Ua8oCSmYB4eBHlL5D8qNUMjaG7WP3Vh6f6QIumkfLCCo4P0MC+gIss60+70lKhw34pkvf8UsZr9mUGR6MsTcgL382KqiogtQLhDxQMNF80vE9EpfnUaNT/6LWfHbyUg4y5ti0VsSpFkaJ9Qgn5c933+DPPMjOWwLtw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tGxVk-0005wc-LW; Fri, 29 Nov 2024 04:42:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74542] [PATCH v2 03/16] gnu-maintenance: Savannah/Xorg updaters no longer abort on network errors. 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, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Fri, 29 Nov 2024 09:42:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74542 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74542@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74542-submit@debbugs.gnu.org id=B74542.173287328322665 (code B ref 74542); Fri, 29 Nov 2024 09:42:04 +0000 Received: (at 74542) by debbugs.gnu.org; 29 Nov 2024 09:41:23 +0000 Received: from localhost ([127.0.0.1]:41059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGxV4-0005tU-3L for submit@debbugs.gnu.org; Fri, 29 Nov 2024 04:41:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGxUd-0005pe-CN for 74542@debbugs.gnu.org; Fri, 29 Nov 2024 04:40:57 -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 1tGxUV-0003nW-6S; Fri, 29 Nov 2024 04:40:49 -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=kl+o3JDOVclar88DBNdgoen9lS8pCWyJIdQt9A5uZV8=; b=B4HEUDS2OjWeEVhJEQpe KUyTaWVSKSao2OwBJ/bu3DmfCPlLj0ardSrG9DezS627+erUFphvEzs/9lFBUrgWTDR2RIDa7hwID HekNRzAncJdvzJ6Qwhp/DNVJS5k95E75XvNUWNu67VtfvAWGY6xN3m4lE2ePjZOJd7zysCVCN2L1I v4OziR5+tvpkK7f2VyV+AIQqPvEOBXXj9P5h92QBh+tNJyQce/746CfLky3casWxm3E2fGdWojdM/ 6ntHAQ7UIfNwtjR3Jx2QcUu97etVf385qd0W0q4jXF2RSmbBgMPunahQsM5TH8qszlzopZXhun4MA 1JwHMZtlIs4lCQ==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 29 Nov 2024 10:40:06 +0100 Message-ID: <1914331d67523535127655bb69cc9bb281a776a6.1732872498.git.ludo@gnu.org> X-Mailer: git-send-email 2.46.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-Queue-Id: D04175CCBB X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -4.31 X-Spam-Score: -4.31 X-TUID: E61mRGJRIdJh Previously these updaters would fail upon networking error, causing the whole process to abort: $ guix refresh coreutils libgcrypt guix refresh: error: connect*: Connection refused * guix/gnu-maintenance.scm (import-release*, import-xorg-release): Wrap in ‘false-if-networking-error’. Change-Id: I8d309bf8662e2d46460585b4a1b7da0a4f2e8907 --- guix/gnu-maintenance.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index f34dcfc13f..866b960a4a 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -469,10 +469,12 @@ (define* (import-release* package #:key (version #f)) \"emacs-auctex\", for instance.)" (let-values (((server directory) (ftp-server/directory package))) - (false-if-ftp-error (import-release (package-upstream-name package) - #:version version - #:server server - #:directory directory)))) + (false-if-networking-error + (false-if-ftp-error + (import-release (package-upstream-name package) + #:version version + #:server server + #:directory directory))))) ;;; @@ -913,13 +915,14 @@ (define* (import-xorg-release package #:key (version #f)) "Return the latest release of PACKAGE. Optionally include a VERSION string to fetch a specific version." (let ((uri (string->uri (origin-uri (package-source package))))) - (false-if-ftp-error - (import-ftp-release - (package-name package) - #:version version - #:server "ftp.freedesktop.org" - #:directory - (string-append "/pub/xorg/" (dirname (uri-path uri))))))) + (false-if-networking-error + (false-if-ftp-error + (import-ftp-release + (package-name package) + #:version version + #:server "ftp.freedesktop.org" + #:directory + (string-append "/pub/xorg/" (dirname (uri-path uri)))))))) (define* (import-kernel.org-release package #:key (version #f)) "Return the latest release of PACKAGE, a Linux kernel package. -- 2.46.0