From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id sIuZNN5qUmBdfQAA0tVLHw (envelope-from ) for ; Wed, 17 Mar 2021 20:47:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id EHpeMN5qUmD0SQAA1q6Kng (envelope-from ) for ; Wed, 17 Mar 2021 20:47:26 +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 6E5C62182C for ; Wed, 17 Mar 2021 21:47:26 +0100 (CET) Received: from localhost ([::1]:33192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMd4f-0001LX-Jm for larch@yhetil.org; Wed, 17 Mar 2021 16:47:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMd4J-0001KN-Kx for guix-patches@gnu.org; Wed, 17 Mar 2021 16:47:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60825) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lMd4J-0000il-7N for guix-patches@gnu.org; Wed, 17 Mar 2021 16:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lMd4H-0001K0-Ud for guix-patches@gnu.org; Wed, 17 Mar 2021 16:47:01 -0400 Subject: bug#47160: [PATCH] scripts: substitute: Add back some error handling. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Wed, 17 Mar 2021 20:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 47160 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 47160-done@debbugs.gnu.org Mail-Followup-To: 47160@debbugs.gnu.org, mail@cbaines.net, mail@cbaines.net Received: via spool by 47160-done@debbugs.gnu.org id=D47160.16160139715019 (code D ref 47160); Wed, 17 Mar 2021 20:47:01 +0000 Received: (at 47160-done) by debbugs.gnu.org; 17 Mar 2021 20:46:11 +0000 Received: from localhost ([127.0.0.1]:44136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lMd3T-0001It-0T for submit@debbugs.gnu.org; Wed, 17 Mar 2021 16:46:11 -0400 Received: from mira.cbaines.net ([212.71.252.8]:53044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lMd3O-0001Ih-SS for 47160-done@debbugs.gnu.org; Wed, 17 Mar 2021 16:46:08 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id D3F7027BCD1; Wed, 17 Mar 2021 20:46:05 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 73c70d83; Wed, 17 Mar 2021 20:46:05 +0000 (UTC) References: <20210315151133.16282-1-mail@cbaines.net> <20210316234628.24479-1-mail@cbaines.net> <8735wt1qm2.fsf_-_@gnu.org> User-agent: mu4e 1.4.15; emacs 27.1 From: Christopher Baines In-reply-to: <8735wt1qm2.fsf_-_@gnu.org> Date: Wed, 17 Mar 2021 20:46:05 +0000 Message-ID: <87zgz1cxv6.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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=1616014046; 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:resent-to: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=leTdUckqpdCnCMOCtfUm2YCTKQGYYsvGCq6Z460SqlI=; b=HyLFDM5AQIvaE/+hqZim1erLVfdmIM0B3kIcCscT+HcxdYHKtAnTujt9ciIX5AMeU7T3lD 3YSRT996OBRSdf8DdU4gwWt8OuylvtYMHZH3KGteRtwnEihJZOMbNWPJjCLKbuCM4Y6tXS uGIuV0SGIN/mz0b2b7lQXluH7n2ZR3wUZ8WZ0qF1d38VqWhKxkHZHhwU1Kh8NtoqT3E0Sl YMcYx7He2yxAOuUp9jJCOGsX5dxRY2uJeHZIyzrIPCmCEAjOr58XGvNjyQ/EnE8gp87Dy1 6aUgCJc4rCRUTd3tHKikcMQGc3ecNkIbtEtdbePSf+eyJ4N/KUXYaaMV+wbz0A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1616014046; a=rsa-sha256; cv=none; b=O8SdsmwNKEb0UtgO7UWOpEHW4FOAPG/NhCyOUJYZJXhbLy90zwB/gFETpP7auUFfyNwEPu 2XWhEvJ1SmaHIDF6slUTTK29Pi/ahqJSAM3C44TKQuFR8wy21GdQLpKD7JV1MdXFb4c8Rb xJ5bFjQyQ+d+cGKdPnGsUFIjkoS9HtSqoKRMlbQSW4IXcQiFCLQuJSvmt+V7ikMJ8sdqC6 pWBXV/leCJ/km0n/F3Xz6LRoYIyOo3wdO6IkiYbB8/SDIRm6Ea3NCJU8AjlCDYuy1BqdQr 4qayjJXEhLU9l6Iig2Qk1jH5XdiSL7tMSL38CZsDlPH46YxD0KZF3O5BtOTipg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; 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: -4.50 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; 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: 6E5C62182C X-Spam-Score: -4.50 X-Migadu-Scanner: scn0.migadu.com X-TUID: zn72ygXiCBIX --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Howdy! > > Christopher Baines skribis: > >> In f50f5751fff4cfc6d5abba9681054569694b7a5c, the way fetch was called wi= thin >> process-substitution was changed. As call-with-cached-connection actual= ly >> 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 procedu= re. >> (with-cached-connection): New syntax rule. >> (process-substitution): Retry once for some errors when making HTTP requ= ests >> 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 i= s used >> within process-substitution. >> >> * guix/scripts/substitute.scm (process-substitution): Remove >> call-with-connection-error-handling call. > > Both LGTM, thank you! Great, pushed as b48204259aa9cad80c5b23a4060e2d796007ec7a. Note that this won't have any affect on the substitute script for most users until the guix package is updated to include these changes. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmBSao1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XfRrA//R+PiZGPPWoZV8M1We/wQW8uQ7O3HwXPG c+klF38zgrbiFHreGriob3JwGdPTR+6NUm56Dne8aPRsLHdMdDWMcfAVsNDGtD5g mRh1vIC1mtd4hlXoiV8gSrsMX05anZ5HVXwqD7ZvzFfwQhQBI5N1XT2d2pcTY5PA NbGGNNmwAMzIlTmZOtOzx52aokX6Cffskw3//HoE/dJLEaUJ+61JqCB7X9svxJ22 jboq1uX+Q39HjL0nunE8BxthdQf45LvG53gJ/q5JK94o4fKyHUuvfukMEvvaffS8 bZnB74Zx2o9oQ3DFZ5ectQok3iEHV93GoTHhiKlzxVREKZ5Nm9n+LjfsO297/SYn 9bDT1XMWjFugxp2zxGTbob0ojw44DlO9toZK6LV7uqj2AQp0OSw0PLllLv7cWv7n jE/D2b+z8SqU6ytBe4LzmjEUVoDTQnbcP4ASiV2ixR7yXimc6o+2Mkh8lHTKeSwv vyoEDBjEB16mXm0SnjimbHvjlR205FoIGugW9o/Wl0rPE9P6RAESvr8C2+BzL1xP QvbJzrGo3oOVVHg6g1wu9YQ8A7vZbkGXZFTQSQjdZf2vdKorzkIvcaDYOPqmSdo6 QdgkWWIgPSYUzv3izEefLaaawsExHLVfyHXHiO74iV1t2YL8wgHb7RpvqVZYGpL9 AqvCigBmeM0= =t8H9 -----END PGP SIGNATURE----- --=-=-=--