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 eJYXL7TYJ2D8WAAA0tVLHw (envelope-from ) for ; Sat, 13 Feb 2021 13:48:36 +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 0DPHKrTYJ2DUHQAAbx9fmQ (envelope-from ) for ; Sat, 13 Feb 2021 13:48:36 +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 7C720280ED for ; Sat, 13 Feb 2021 14:48:36 +0100 (CET) Received: from localhost ([::1]:45044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAvHn-0002qk-Mk for larch@yhetil.org; Sat, 13 Feb 2021 08:48:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lAvHV-0002kt-7O for guix-patches@gnu.org; Sat, 13 Feb 2021 08:48:17 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50521) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lAvHQ-0007AB-Cr for guix-patches@gnu.org; Sat, 13 Feb 2021 08:48:16 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lAvHP-0002yE-OK for guix-patches@gnu.org; Sat, 13 Feb 2021 08:48:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45409] [PATCH v5 11/14] substitute: Remove redundant fetch arguments. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Feb 2021 13:48:11 +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.161322405111267 (code B ref 45409); Sat, 13 Feb 2021 13:48:11 +0000 Received: (at 45409) by debbugs.gnu.org; 13 Feb 2021 13:47:31 +0000 Received: from localhost ([127.0.0.1]:33815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lAvGk-0002vZ-TF for submit@debbugs.gnu.org; Sat, 13 Feb 2021 08:47:31 -0500 Received: from mira.cbaines.net ([212.71.252.8]:48206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lAvGd-0002tK-3P for 45409@debbugs.gnu.org; Sat, 13 Feb 2021 08:47:24 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id 1C3C627BC4D for <45409@debbugs.gnu.org>; Sat, 13 Feb 2021 13:47:21 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 7b36c04b for <45409@debbugs.gnu.org>; Sat, 13 Feb 2021 13:47:19 +0000 (UTC) From: Christopher Baines Date: Sat, 13 Feb 2021 13:47:16 +0000 Message-Id: <20210213134719.19625-11-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: 7C720280ED X-Spam-Score: 2.64 X-Migadu-Scanner: scn0.migadu.com X-TUID: d+rdxUbmG+OG It's just called in one place, with hardcoded argument values, so just inline them. * guix/scripts/substitute.scm (fetch): Remove arguments that don't vary, copy the values from the call site in process-substitution. (process-substitution): Remove unnecessary argument values from fetch call. --- guix/scripts/substitute.scm | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index a2b1526cc6..26fd05429f 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -169,18 +169,12 @@ again." (sigaction SIGALRM SIG_DFL) (apply values result))))) -(define* (fetch uri #:key (buffered? #t) (timeout? #t) - (keep-alive? #f)) +(define (fetch uri) "Return a binary input port to URI and the number of bytes it's expected to -provide. - -When PORT is true, use it as the underlying I/O port for HTTP transfers; when -PORT is false, open a new connection for URI. When KEEP-ALIVE? is true, the -connection (typically PORT) is kept open once data has been fetched from URI." +provide." (case (uri-scheme uri) ((file) - (let ((port (open-file (uri-path uri) - (if buffered? "rb" "r0b")))) + (let ((port (open-file (uri-path uri) "r0b"))) (values port (stat:size (stat port))))) ((http https) (guard (c ((http-get-error? c) @@ -192,17 +186,15 @@ connection (typically PORT) is kept open once data has been fetched from URI." ;; sudo tc qdisc add dev eth0 root netem delay 1500ms ;; and then cancel with: ;; sudo tc qdisc del dev eth0 root - (with-timeout (if timeout? - %fetch-timeout - 0) + (with-timeout %fetch-timeout (begin (warning (G_ "while fetching ~a: server is somewhat slow~%") (uri->string uri)) (warning (G_ "try `--no-substitutes' if the problem persists~%"))) (http-fetch uri #:text? #f #:open-connection open-connection-for-uri/maybe - #:keep-alive? keep-alive? - #:buffered? buffered? + #:keep-alive? #t + #:buffered? #f #:verify-certificate? #f)))) (else (leave (G_ "unsupported substitute URI scheme: ~a~%") @@ -727,8 +719,7 @@ the current output port." (let*-values (((raw download-size) ;; 'guix publish' without '--cache' doesn't specify a ;; Content-Length, so DOWNLOAD-SIZE is #f in this case. - (fetch uri #:buffered? #f #:timeout? #f - #:keep-alive? #t)) + (fetch uri)) ((progress) (let* ((dl-size (or download-size (and (equal? compression "none") -- 2.30.0