From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id uE0AE0nxAmDwIwAA0tVLHw (envelope-from ) for ; Sat, 16 Jan 2021 13:59:37 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 4IXWDknxAmBEQQAA1q6Kng (envelope-from ) for ; Sat, 16 Jan 2021 13:59:37 +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 07842940509 for ; Sat, 16 Jan 2021 13:59:36 +0000 (UTC) Received: from localhost ([::1]:60470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0m75-0007EB-La for larch@yhetil.org; Sat, 16 Jan 2021 08:59:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0m6Y-0007Ba-RD for guix-patches@gnu.org; Sat, 16 Jan 2021 08:59:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59297) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0m6Y-0004vE-JP for guix-patches@gnu.org; Sat, 16 Jan 2021 08:59:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l0m6Y-0005wO-Hm for guix-patches@gnu.org; Sat, 16 Jan 2021 08:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45409] [PATCH v4 02/13] substitute: Remove connection handling from fetch. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jan 2021 13:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45409 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45409@debbugs.gnu.org Received: via spool by 45409-submit@debbugs.gnu.org id=B45409.161080549222682 (code B ref 45409); Sat, 16 Jan 2021 13:59:02 +0000 Received: (at 45409) by debbugs.gnu.org; 16 Jan 2021 13:58:12 +0000 Received: from localhost ([127.0.0.1]:42587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0m5j-0005tV-Hc for submit@debbugs.gnu.org; Sat, 16 Jan 2021 08:58:12 -0500 Received: from mira.cbaines.net ([212.71.252.8]:49412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0m5g-0005sL-1G for 45409@debbugs.gnu.org; Sat, 16 Jan 2021 08:58:09 -0500 Received: from localhost (188.29.101.63.threembb.co.uk [188.29.101.63]) by mira.cbaines.net (Postfix) with ESMTPSA id D0A9327BC14 for <45409@debbugs.gnu.org>; Sat, 16 Jan 2021 13:58:06 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 6a747df8 for <45409@debbugs.gnu.org>; Sat, 16 Jan 2021 13:58:03 +0000 (UTC) From: Christopher Baines Date: Sat, 16 Jan 2021 13:57:52 +0000 Message-Id: <20210116135803.21955-2-mail@cbaines.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210116135803.21955-1-mail@cbaines.net> References: <20210116135803.21955-1-mail@cbaines.net> MIME-Version: 1.0 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" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.65 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: 07842940509 X-Spam-Score: 2.65 X-Migadu-Scanner: scn1.migadu.com X-TUID: rdWOPapH2VNi http-fetch does this, so just use that code instead. * guix/scripts/substitute.scm (fetch): Remove connection handling when the port is closed. --- guix/scripts/substitute.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index aaafb5d605..74fce15117 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -200,14 +200,10 @@ connection (typically PORT) is kept open once data has been fetched from URI." (warning (G_ "while fetching ~a: server is somewhat slow~%") (uri->string uri)) (warning (G_ "try `--no-substitutes' if the problem persists~%"))) - (begin - (when (or (not port) (port-closed? port)) - (set! port (guix:open-connection-for-uri - uri #:verify-certificate? #f))) - (http-fetch uri #:text? #f #:port port - #:keep-alive? keep-alive? - #:buffered? buffered? - #:verify-certificate? #f)))))) + (http-fetch uri #:text? #f #:port port + #:keep-alive? keep-alive? + #:buffered? buffered? + #:verify-certificate? #f))))) (else (leave (G_ "unsupported substitute URI scheme: ~a~%") (uri->string uri))))) -- 2.30.0