Received: (at 76558-done) by debbugs.gnu.org; 4 Mar 2025 23:33:14 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 04 18:33:14 2025
Received: from localhost ([127.0.0.1]:33537 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tpblB-00055N-U5
for submit <at> debbugs.gnu.org; Tue, 04 Mar 2025 18:33:14 -0500
Received: from hera.aquilenet.fr ([185.233.100.1]:33994)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tpbl8-00054z-TD
for 76558-done <at> debbugs.gnu.org; Tue, 04 Mar 2025 18:33:11 -0500
Received: from localhost (localhost [127.0.0.1])
by hera.aquilenet.fr (Postfix) with ESMTP id B27EE1F4;
Wed, 5 Mar 2025 00:33:04 +0100 (CET)
Authentication-Results: hera.aquilenet.fr;
none
X-Virus-Scanned: Debian amavis at hera.aquilenet.fr
Received: from hera.aquilenet.fr ([127.0.0.1])
by localhost (hera.aquilenet.fr [127.0.0.1]) (amavis, port 10024) with ESMTP
id JOh2A_VDZfNl; Wed, 5 Mar 2025 00:33:03 +0100 (CET)
Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201])
by hera.aquilenet.fr (Postfix) with ESMTPSA id 02D711C0;
Wed, 5 Mar 2025 00:33:02 +0100 (CET)
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: 76558-done <at> debbugs.gnu.org
Subject: Re: [bug#76558] [PATCH] substitutes: Tolerate GnuTLS push/pull
errors when fetching narinfos.
In-Reply-To: <fcc36018594ed1b3217d7d54c614bb1aff16bc06.1740499070.git.ludo@HIDDEN>
("Ludovic =?utf-8?Q?Court=C3=A8s=22's?= message of "Tue, 25 Feb 2025
16:58:52 +0100")
References: <fcc36018594ed1b3217d7d54c614bb1aff16bc06.1740499070.git.ludo@HIDDEN>
Date: Wed, 05 Mar 2025 00:33:02 +0100
Message-ID: <87o6yg74nl.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Rspamd-Server: hera
X-Rspamd-Queue-Id: B27EE1F4
X-Spamd-Result: default: False [6.40 / 15.00]; SPAM_FLAG(5.00)[];
BAYES_HAM(-3.00)[100.00%]; NEURAL_SPAM(3.00)[1.000];
SUSPICIOUS_RECIPS(1.50)[]; MIME_GOOD(-0.10)[text/plain];
TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[];
RCPT_COUNT_SEVEN(0.00)[7]; MIME_TRACE(0.00)[0:+];
RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2];
FROM_HAS_DN(0.00)[];
FREEMAIL_CC(0.00)[twilken.net,cbaines.net,jpoiret.xyz,gnu.org,gmail.com,tobias.gr];
MID_RHS_MATCH_FROM(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com];
RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[];
TAGGED_RCPT(0.00)[]; ARC_NA(0.00)[]
X-Spamd-Bar: ++++++
X-Rspamd-Action: add header
X-Spam-Level: ******
X-Spam: Yes
X-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: 76558-done
Cc: Josselin Poiret <dev@HIDDEN>,
Simon Tournier <zimon.toutoune@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>,
Tobias Geerinckx-Rice <me@HIDDEN>, Timo Wilken <git@HIDDEN>,
Christopher Baines <guix@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
Ludovic Court=C3=A8s <ludo@HIDDEN> skribis:
> Fixes <https://issues.guix.gnu.org/75679>.
>
> Fixes this infamous error:
>
> substitute: looking for substitutes on 'https://bordeaux.guix.gnu.org'.=
.. 0.0%guix substitute: error: TLS error in procedure 'write_to_session_r=
ecord_port': Error in the push function.
> guix system: error: `/gnu/store/=E2=80=A6-guix-1.4.0-32.5f6fdad/bin/gui=
x substitute' died unexpectedly
>
> * guix/substitutes.scm (call-with-connection-error-handling): Report
> =E2=80=98error/push-error=E2=80=99 and =E2=80=98error/pull-error=E2=80=99=
as mere warnings.
>
> Reported-by: Timo Wilken <git@HIDDEN>
> Change-Id: Ibc507cb88b164cbb91dff95aa18d9974c573f7c9
Pushed as c92fbc83d4d2a98cc15e10d1fc4d5bcc13c9af5b.
> At long last. Note that we'll need to update the =E2=80=98guix=E2=80=99 =
package
> to make this change effective.
Ludo'.
Ludovic Courtès <ludo@HIDDEN>:Ludovic Courtès <ludo@HIDDEN>:
Received: (at submit) by debbugs.gnu.org; 25 Feb 2025 15:59:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Feb 25 10:59:12 2025
Received: from localhost ([127.0.0.1]:48069 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tmxKx-0006vj-F9
for submit <at> debbugs.gnu.org; Tue, 25 Feb 2025 10:59:11 -0500
Received: from lists.gnu.org ([2001:470:142::17]:40914)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tmxKu-0006vO-5D
for submit <at> debbugs.gnu.org; Tue, 25 Feb 2025 10:59:09 -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 <ludo@HIDDEN>) id 1tmxKo-0006HD-F7
for guix-patches@HIDDEN; Tue, 25 Feb 2025 10:59:02 -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 <ludo@HIDDEN>)
id 1tmxKm-0001ZN-Ih; Tue, 25 Feb 2025 10:59:00 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to:
references; bh=SBieDIMhugAXCss8gdQ/qMx+Sesrm9QZfcLC8nQ/5Rc=; b=jy/L+i0tAKCMFe
UP6NN2wEBR5unkSTI/9d0I0/2JHM+/IC3sZg25TmzcQARRDk1cbC4HtI6e72BRkKdpKW0QP7uMl/4
RJxnCdJ1wiUzcSt1IrlhcY5q7q11dm+Xdvfe9Zkbyr0rXNTQceq//FaMEM1RBvqtuZ0+7ynYNvNZx
Qn55hPJjuSkRW25xPSRuG8a/d/R/aGHK2+DVdxEu09YMl7iLbUNikCILyQUADfKC+Vh+0B36U3nJZ
Q+8UFAkI+037l4avdLYcG3p7yILX/7pnugFF98dvI7BcCFV+EWpAPnqPddNeA2Y70LaoImZ4FuUdg
wxI0NqxvLBJOSqRbevog==;
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] substitutes: Tolerate GnuTLS push/pull errors when fetching
narinfos.
Date: Tue, 25 Feb 2025 16:58:52 +0100
Message-ID: <fcc36018594ed1b3217d7d54c614bb1aff16bc06.1740499070.git.ludo@HIDDEN>
X-Mailer: git-send-email 2.48.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Debbugs-Cc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: submit
Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@HIDDEN>,
Timo Wilken <git@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Fixes <https://issues.guix.gnu.org/75679>.
Fixes this infamous error:
substitute: looking for substitutes on 'https://bordeaux.guix.gnu.org'... 0.0%guix substitute: error: TLS error in procedure 'write_to_session_record_port': Error in the push function.
guix system: error: `/gnu/store/…-guix-1.4.0-32.5f6fdad/bin/guix substitute' died unexpectedly
* guix/substitutes.scm (call-with-connection-error-handling): Report
‘error/push-error’ and ‘error/pull-error’ as mere warnings.
Reported-by: Timo Wilken <git@HIDDEN>
Change-Id: Ibc507cb88b164cbb91dff95aa18d9974c573f7c9
---
guix/substitutes.scm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
Hi!
At long last. Note that we'll need to update the ‘guix’ package
to make this change effective.
Ludo’.
diff --git a/guix/substitutes.scm b/guix/substitutes.scm
index e31b3940203..7ca55788d5e 100644
--- a/guix/substitutes.scm
+++ b/guix/substitutes.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013-2021, 2023-2024 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2013-2021, 2023-2025 Ludovic Courtès <ludo@HIDDEN>
;;; Copyright © 2014 Nikita Karetnikov <nikita@HIDDEN>
;;; Copyright © 2018 Kyle Meyer <kyle@HIDDEN>
;;; Copyright © 2020 Christopher Baines <mail@HIDDEN>
@@ -35,7 +35,10 @@ (define-module (guix substitutes)
#:select ((open-connection-for-uri
. guix:open-connection-for-uri)
resolve-uri-reference))
- #:autoload (gnutls) (error->string error/premature-termination)
+ #:autoload (gnutls) (error->string
+ error/premature-termination
+ error/pull-error
+ error/push-error)
#:use-module (guix progress)
#:use-module (ice-9 match)
#:use-module (ice-9 format)
@@ -154,7 +157,9 @@ (define* (call-with-connection-error-handling uri proc)
(system-error-errno `(system-error ,@args)))))
#f)
(('gnutls-error error proc . rest)
- (if (eq? error error/premature-termination)
+ (if (memq error (list error/premature-termination
+ error/pull-error
+ error/push-error))
(begin
(warning (G_ "~a: TLS connection failed: in ~a: ~a~%") host
proc (error->string error))
base-commit: 8e5094497ccb187d712bb3dfcddb87c6be5698f7
--
2.48.1
Ludovic Courtès <ludo@HIDDEN>:guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN.
Full text available.guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN:bug#76558; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.