From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id CDb2Of6kRWfBIgEAe85BDQ:P1 (envelope-from ) for ; Tue, 26 Nov 2024 10:37:51 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id CDb2Of6kRWfBIgEAe85BDQ (envelope-from ) for ; Tue, 26 Nov 2024 11:37:51 +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=vaJqR3+c; dkim=fail ("body hash did not verify") header.d=gnu.org header.s=fencepost-gnu-org header.b=hUXg78eq; 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=1732617470; a=rsa-sha256; cv=none; b=MPP+nl+s1h6D6uO55yv+5HNoWoXBoEpaVIRQ2V/79NI45rOiaKYK8XzjTBrTQLDoPs3Ykw XZXOlfXxzpuXZNL/ich9uPxNsPnYH2hVE+83BMH7sWERx9zLeAv3k9NPPfYMq69WOEC1pT q0vV81RNbPSUjuysmF7XEmxHF6kNozLhmwCUHcg/v1fTPuHgeUraI9iu23ugj7EXpAisF0 kU/2pQnG4SFr32gbWJdZVmAKlq2qiq62N7lDLEzyvs7oG9pJT31fesIKnvmUW7KGwDU+fk 52eq59igehvBn3L6GmHK6qTT/SwafKVKP3fOKHDDSggp2OTI8fWp35Kj33/ViQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=vaJqR3+c; dkim=fail ("body hash did not verify") header.d=gnu.org header.s=fencepost-gnu-org header.b=hUXg78eq; 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732617470; 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=GmgeXaeo8eyB3oGdvPvNMpB3BPJ3NIRsG3ScjlYDn6s=; b=jhYi73G441fbGM1Mf7eZv04WYKePk1sx2LucXiH6AuOMTqWXA2G2uayi49vBwmro+nxqfc k114K581c6fZgEyv5qkRP0t0TwTMDuizEXqFV0qDNkeVxFPAgP+P9Upn0DS9mLhrrWxXQT LNQ/4oqCRsBrtDzADaLZwStp+3csnv8FxAVhpbBN97lCDNuHxdzEjE5XAEpYhpVNoWwtou xTfuY0Gp0lJfb+F6RSUHM4dl7Mmua07KjZiLaijPylIqLreIXAFAl0MAcBDlbD6wwqKD+8 nLyfsns64HgUAnUob/3gR1JwTN01pt7eGM3z2IlopANsDQ9j3dQg6jlFNRdQ3g== 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 CF3EE73F0C for ; Tue, 26 Nov 2024 11:37:50 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tFswW-0005JY-Dm; Tue, 26 Nov 2024 05:37:16 -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 1tFswL-0005IN-1b for guix-patches@gnu.org; Tue, 26 Nov 2024 05:37:05 -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 1tFswK-0000ou-MJ; Tue, 26 Nov 2024 05:37:04 -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=vaJqR3+cGUstyW35KiGIxShUhLqhXMwflQwd2CpR8zn7xbc79bvktf8O/Z3ebQuAHG4ykIfp5WekzJYF6AE+ucS7mz0fwbN2j2VvODiOS6aghRmNalHDrqmK5GRlVqFbhgAv7RtcY5SkMBqQnsY66GdiCF2jbbW2mPQ3e50GoWpLz16qbj48g+DI/fWumM6dM8Y/soEJB+Vh9wHOkE9F9pt56bpDRANSgs7D9FnYZwY05JK7zhObV2ZjxpJcJlYavNtksBDTC2+6JBTKocknQJhLqzmdyouiepbzCPojBhIla2Gj6dXpFakbb8K3ouZTjkmGP2TsFeyPayh4Tpii5A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tFswJ-0002dt-Ak; Tue, 26 Nov 2024 05:37:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74542] [PATCH 03/11] 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: Tue, 26 Nov 2024 10:37:03 +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 Court?s , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic Court?s , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74542-submit@debbugs.gnu.org id=B74542.173261739510032 (code B ref 74542); Tue, 26 Nov 2024 10:37:03 +0000 Received: (at 74542) by debbugs.gnu.org; 26 Nov 2024 10:36:35 +0000 Received: from localhost ([127.0.0.1]:46196 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFsvp-0002bd-KM for submit@debbugs.gnu.org; Tue, 26 Nov 2024 05:36:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFsvj-0002aT-4o for 74542@debbugs.gnu.org; Tue, 26 Nov 2024 05:36:28 -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 1tFstY-00005O-Ln; Tue, 26 Nov 2024 05:34:12 -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=hUXg78eqqEb0caSIy3z2 Us1K7+gJhuLuq4k+Zeg7s/XWBukYOXCHGvoc5jJvNZbSQ/RwkIQORnFU3gzg7Munw6q8H+89yDX/l EIbnzrT7xjCneXdFrPAYpR+9qkpVdLFoeIA5s7k0Anw37MML/KiHLlbglQcc+NJ8iqmop5Q9v7kUQ lygiPaIKeQafIVMvyUiIZzqNapdr78BZsfVIILPb/HHUGJJ8xI1YUkGiZ3Ynt/4jL4lydTdSvhtKW P/O81SZMIx4Ms8NA/VDAd2Q7SnTkO26APP5O5eWKVca5qbqxwLIBiNRDQTqzI8Frj6FHcVOQH5kvn cTNGiZDYIVUViw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Tue, 26 Nov 2024 11:33:42 +0100 Message-ID: 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.09 X-Spam-Score: -4.09 X-Migadu-Queue-Id: CF3EE73F0C X-Migadu-Scanner: mx10.migadu.com X-TUID: wYSHyJCIOWBy 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