From f50f5751fff4cfc6d5abba9681054569694b7a5c Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Thu, 7 Jan 2021 20:21:50 +0000
Subject: [PATCH] substitute: Change connection cache handling in
process-substitution.
Just pass open-connection-for-uri/maybe to http-fetch, this removes the need
for with-cached-connection and passing the port in.
* guix/scripts/substitute.scm (fetch): Don't take a port as an argument, and
pass open-connection-for-uri/maybe to http-fetch.
(process-substitution): Don't call fetch with with-cached-connection.
---
guix/scripts/substitute.scm | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index cd52ad747eb..5d4884a7db4 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -170,7 +170,7 @@ (define-syntax-rule (with-timeout duration handler body ...)
(apply values result)))))
(define* (fetch uri #:key (buffered? #t) (timeout? #t)
- (keep-alive? #f) (port #f))
+ (keep-alive? #f))
"Return a binary input port to URI and the number of bytes it's expected to
provide.
@@ -199,7 +199,8 @@ (define* (fetch uri #:key (buffered? #t) (timeout? #t)
(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 #:port port
+ (http-fetch uri #:text? #f
+ #:open-connection open-connection-for-uri/maybe
#:keep-alive? keep-alive?
#:buffered? buffered?
#:verify-certificate? #f))))
@@ -752,10 +753,8 @@ (define (dump-file/deduplicate* . args)
(let*-values (((raw download-size)
;; 'guix publish' without '--cache' doesn't specify a
;; Content-Length, so DOWNLOAD-SIZE is #f in this case.
- (with-cached-connection uri port
- (fetch uri #:buffered? #f #:timeout? #f
- #:port port
- #:keep-alive? #t)))
+ (fetch uri #:buffered? #f #:timeout? #f
+ #:keep-alive? #t))
((progress)
(let* ((dl-size (or download-size
(and (equal? compression "none")
--
GitLab