From patchwork Mon Mar 15 16:15:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 27751 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 707EE27BC54; Mon, 15 Mar 2021 16:19:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3D65E27BC52 for ; Mon, 15 Mar 2021 16:19:38 +0000 (GMT) Received: from localhost ([::1]:50758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLpwP-00011Q-Er for patchwork@mira.cbaines.net; Mon, 15 Mar 2021 12:19:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLpsx-0005Fj-BC for guix-patches@gnu.org; Mon, 15 Mar 2021 12:16:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53263) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLpsx-00029N-3h for guix-patches@gnu.org; Mon, 15 Mar 2021 12:16:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lLpsw-0007qC-Vx for guix-patches@gnu.org; Mon, 15 Mar 2021 12:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47160] [PATCH v2 2/2] scripts: substitute: Tweak error reporting in process-substitution. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Mar 2021 16:16: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: 47160@debbugs.gnu.org Received: via spool by 47160-submit@debbugs.gnu.org id=B47160.161582493630079 (code B ref 47160); Mon, 15 Mar 2021 16:16:02 +0000 Received: (at 47160) by debbugs.gnu.org; 15 Mar 2021 16:15:36 +0000 Received: from localhost ([127.0.0.1]:36573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lLpsV-0007p3-Mf for submit@debbugs.gnu.org; Mon, 15 Mar 2021 12:15:35 -0400 Received: from mira.cbaines.net ([212.71.252.8]:33368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lLpsT-0007oq-An for 47160@debbugs.gnu.org; Mon, 15 Mar 2021 12:15:33 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id EE96927BC55 for <47160@debbugs.gnu.org>; Mon, 15 Mar 2021 16:15:32 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 694d5986 for <47160@debbugs.gnu.org>; Mon, 15 Mar 2021 16:15:32 +0000 (UTC) From: Christopher Baines Date: Mon, 15 Mar 2021 16:15:32 +0000 Message-Id: <20210315161532.1716-2-mail@cbaines.net> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210315161532.1716-1-mail@cbaines.net> References: <20210315161532.1716-1-mail@cbaines.net> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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. --- guix/scripts/substitute.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 16ba28455f..997e2565e0 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -447,16 +447,13 @@ the current output port." (warning (G_ "while fetching ~a: server is somewhat slow~%") (uri->string uri)) (warning (G_ "try `--no-substitutes' if the problem persists~%"))) - (call-with-connection-error-handling + (call-with-cached-connection-and-error-handling uri - (lambda () - (call-with-cached-connection-and-error-handling - uri - (lambda (port) - (http-fetch uri #:text? #f - #:port port - #:keep-alive? #t - #:buffered? #f)))))))) + (lambda (port) + (http-fetch uri #:text? #f + #:port port + #:keep-alive? #t + #:buffered? #f)))))) (else (leave (G_ "unsupported substitute URI scheme: ~a~%") (uri->string uri)))))