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 cBmSNLHYJ2AdQgAA0tVLHw (envelope-from ) for ; Sat, 13 Feb 2021 13:48:33 +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 4L8qMLHYJ2BHHwAAbx9fmQ (envelope-from ) for ; Sat, 13 Feb 2021 13:48:33 +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 7F7D0280E7 for ; Sat, 13 Feb 2021 14:48:33 +0100 (CET) Received: from localhost ([::1]:44806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAvHk-0002i2-HZ for larch@yhetil.org; Sat, 13 Feb 2021 08:48:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lAvHH-0002h4-0W for guix-patches@gnu.org; Sat, 13 Feb 2021 08:48:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50510) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lAvHG-00076X-PZ for guix-patches@gnu.org; Sat, 13 Feb 2021 08:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lAvHG-0002wp-JG for guix-patches@gnu.org; Sat, 13 Feb 2021 08:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45409] [PATCH v5 02/14] substitute: Remove connection handling from fetch. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Feb 2021 13:48: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.161322404711186 (code B ref 45409); Sat, 13 Feb 2021 13:48:02 +0000 Received: (at 45409) by debbugs.gnu.org; 13 Feb 2021 13:47:27 +0000 Received: from localhost ([127.0.0.1]:33793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lAvGh-0002uL-0L for submit@debbugs.gnu.org; Sat, 13 Feb 2021 08:47:27 -0500 Received: from mira.cbaines.net ([212.71.252.8]:48192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lAvGb-0002sn-9q for 45409@debbugs.gnu.org; Sat, 13 Feb 2021 08:47:22 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id 69B1E27BC2E for <45409@debbugs.gnu.org>; Sat, 13 Feb 2021 13:47:20 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 48b691d5 for <45409@debbugs.gnu.org>; Sat, 13 Feb 2021 13:47:19 +0000 (UTC) From: Christopher Baines Date: Sat, 13 Feb 2021 13:47:07 +0000 Message-Id: <20210213134719.19625-2-mail@cbaines.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210213134719.19625-1-mail@cbaines.net> References: <20210213134719.19625-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.64 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: 7F7D0280E7 X-Spam-Score: 2.64 X-Migadu-Scanner: scn0.migadu.com X-TUID: Fhdf1Z2dO728 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 88610a0781..323957910a 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