ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 23:02:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

substitute: Change connection cache handling in process-substitution.

Browse source 
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.
This commit is contained in:
Christopher Baines 2021-01-07 20:21:50 +00:00
parent 05f38ca8dc
commit f50f5751ff
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
guix/scripts/substitute.scm
View file

@ -170,7 +170,7 @@ (define-syntax-rule (with-timeout duration handler body ...)
(apply values result))))) (apply values result)))))
(define* (fetch uri #:key (buffered? #t) (timeout? #t) (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 "Return a binary input port to URI and the number of bytes it's expected to
provide. provide.
@ -199,7 +199,8 @@ (define* (fetch uri #:key (buffered? #t) (timeout? #t)
(warning (G_ "while fetching ~a: server is somewhat slow~%") (warning (G_ "while fetching ~a: server is somewhat slow~%")
(uri->string uri)) (uri->string uri))
(warning (G_ "try `--no-substitutes' if the problem persists~%"))) (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? #:keep-alive? keep-alive?
#:buffered? buffered? #:buffered? buffered?
#:verify-certificate? #f)))) #:verify-certificate? #f))))
@ -752,10 +753,8 @@ (define (dump-file/deduplicate* . args)
(let*-values (((raw download-size) (let*-values (((raw download-size)
;; 'guix publish' without '--cache' doesn't specify a ;; 'guix publish' without '--cache' doesn't specify a
;; Content-Length, so DOWNLOAD-SIZE is #f in this case. ;; Content-Length, so DOWNLOAD-SIZE is #f in this case.
(with-cached-connection uri port (fetch uri #:buffered? #f #:timeout? #f
(fetch uri #:buffered? #f #:timeout? #f #:keep-alive? #t))
#:port port
#:keep-alive? #t)))
((progress) ((progress)
(let* ((dl-size (or download-size (let* ((dl-size (or download-size
(and (equal? compression "none") (and (equal? compression "none")