[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/14: substitute: Remove redundant fetch arguments.
From: |
guix-commits |
Subject: |
11/14: substitute: Remove redundant fetch arguments. |
Date: |
Mon, 22 Feb 2021 15:44:47 -0500 (EST) |
cbaines pushed a commit to branch master
in repository guix.
commit b9d058e3f7982eed04cc748cc0b24173a3969c52
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Thu Jan 7 20:40:50 2021 +0000
substitute: Remove redundant fetch arguments.
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 a2b1526..26fd054 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")
- 02/14: substitute: Remove connection handling from fetch., (continued)
- 02/14: substitute: Remove connection handling from fetch., guix-commits, 2021/02/22
- 03/14: substitute: Remove redundant let block from fetch., guix-commits, 2021/02/22
- 04/14: guix: Move http-multiple-get to (guix http-client)., guix-commits, 2021/02/22
- 05/14: http-client: Add error handling to http-multiple-get., guix-commits, 2021/02/22
- 06/14: substitute: open-connection-for-uri/maybe add #:verify-certificate?., guix-commits, 2021/02/22
- 10/14: substitute: Remove now redundant connection caching helpers., guix-commits, 2021/02/22
- 08/14: http-client: Accept #:open-connection in http-fetch., guix-commits, 2021/02/22
- 07/14: substitute: Stop using call-with-cached-connection in fetch-narinfos., guix-commits, 2021/02/22
- 09/14: substitute: Change connection cache handling in process-substitution., guix-commits, 2021/02/22
- 13/14: substitute: Remove fetch-narinfos use open-connection-for-uri/maybe., guix-commits, 2021/02/22
- 11/14: substitute: Remove redundant fetch arguments.,
guix-commits <=
- 12/14: substitute: Inline fetch in to process-substitutes., guix-commits, 2021/02/22
- 14/14: substitute: Rework connection error handling., guix-commits, 2021/02/22