From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id nJx4J0xkUmDLOgAA0tVLHw (envelope-from ) for ; Wed, 17 Mar 2021 20:19:24 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id aNa8IkxkUmCHHQAAbx9fmQ (envelope-from ) for ; Wed, 17 Mar 2021 20:19:24 +0000 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 14F0029D2B for ; Wed, 17 Mar 2021 21:19:24 +0100 (CET) Received: from localhost ([::1]:41828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMcdX-0008Lk-5n for larch@yhetil.org; Wed, 17 Mar 2021 16:19:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMcdI-0008LG-KQ for guix-patches@gnu.org; Wed, 17 Mar 2021 16:19:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60724) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lMcdC-0004d3-HC for guix-patches@gnu.org; Wed, 17 Mar 2021 16:19:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lMcdC-0000YL-Da for guix-patches@gnu.org; Wed, 17 Mar 2021 16:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47160] [PATCH] scripts: substitute: Add back some error handling. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Mar 2021 20:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47160 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: 47160@debbugs.gnu.org Received: via spool by 47160-submit@debbugs.gnu.org id=B47160.16160123052082 (code B ref 47160); Wed, 17 Mar 2021 20:19:02 +0000 Received: (at 47160) by debbugs.gnu.org; 17 Mar 2021 20:18:25 +0000 Received: from localhost ([127.0.0.1]:44037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lMccb-0000XW-6c for submit@debbugs.gnu.org; Wed, 17 Mar 2021 16:18:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lMccY-0000XJ-Fs for 47160@debbugs.gnu.org; Wed, 17 Mar 2021 16:18:23 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:43091) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMccT-0004Jm-8S; Wed, 17 Mar 2021 16:18:17 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48650 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lMccS-00040C-7g; Wed, 17 Mar 2021 16:18:16 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20210315151133.16282-1-mail@cbaines.net> <20210316234628.24479-1-mail@cbaines.net> Date: Wed, 17 Mar 2021 21:18:13 +0100 In-Reply-To: <20210316234628.24479-1-mail@cbaines.net> (Christopher Baines's message of "Tue, 16 Mar 2021 23:46:27 +0000") Message-ID: <8735wt1qm2.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1616012364; 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; bh=hqRM+Ms2yMe3a4jOdQGOK5GNuznXvuuQ1bvPyEo4Sdw=; b=KsbH0v6vY+yDJ9INla2kgVoC1kXbfMnch26fT1QxwEv8M18QlFMbYbLd8gDQG8wJE0C6b+ EOShRB1cll2dVJdMfE7RbWeoJOWQcXid8ZGidiwr9DskhqrWJ2yf6vD51m67LQkTYNrw5/ g/WYvUhDAKvKSnacW+6hH7GvVr87/kfpaTJsNttuM1AHPokvuES7a9/3E9Lj/RwxLV2gAq w3puOGnZ5T5mf5CNu96WB+Oms5hD/yscVhqlsOhKKExx5FkH7pStBnQTynELlzSEWh6s90 tyl9cznl/DLnL0rCRn4eb7SedBpqCA6vP5nGDiD/mKRPIeQiZ23J9M9i8S3IcA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1616012364; a=rsa-sha256; cv=none; b=Df28Yug83hYMNtnhEL1B1P3c2EA9/isgsvscBL0q38/hLw7E7s3vdHNuO2a82McEPa47iP Brj9yIpxENvPVqubIf2kywivHIbctdnrPcacT3ciwCx3ZkGTeWeuSQlKxd2tnqBKCgOSp3 yMjJZMRgrATZ9E5omZmuP0ZnN/F/0Ddxl6jRZ9CirIuvX1pFXYsNho7oPmwfmlLm9fwNp+ z4n+NCCnbaKhmwULGX1gwSoZjNheBDxm5VaJD+Ac9y4NpewMtK5od4Dn76uTOEB/xahvA4 jG4EpQsuWPFXsNoLYr0S9QFmCi6n68wZdVFJy5U5s0fCVOGvSsAEZ9dwdcIBPQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.90 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 14F0029D2B X-Spam-Score: -2.90 X-Migadu-Scanner: scn0.migadu.com X-TUID: CRstbWzg/Df7 Howdy! Christopher Baines skribis: > In f50f5751fff4cfc6d5abba9681054569694b7a5c, the way fetch was called wit= hin > process-substitution was changed. As call-with-cached-connection actually > includes important error handling for the opening of a HTTP request, this > change removed some error handling. This commit adds that back. > > Fixes . > > * guix/scripts/substitute.scm (call-with-cached-connection): New procedur= e. > (with-cached-connection): New syntax rule. > (process-substitution): Retry once for some errors when making HTTP reque= sts > to fetch substitutes. [...] > The call-with-connection-error-handling was added in > 20c08a8a45d0f137ead7c05e720456b2aea44402, but that error handling was > previously inside of open-connection-for-uri/maybe, which is related > to (call-)with-cached-connection which was used in process-substitution, = but > only actually used with call-with-cached-connection when used in > fetch-narinfos. > > There's some handling for similar errors within with-networking, which is= used > within process-substitution. > > * guix/scripts/substitute.scm (process-substitution): Remove > call-with-connection-error-handling call. Both LGTM, thank you! Ludo=E2=80=99.