From fbd61b5d3de353bfa468641d087bc53aaa1e63a5 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 7 Jan 2021 19:36:17 +0000 Subject: substitute: Remove buffer handling from fetch. http-fetch does this, so just set the right option. * guix/scripts/substitute.scm (fetch): Remove buffering code, and pass #:buffered? to http-fetch. --- guix/scripts/substitute.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index f9bcead045..88610a0781 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -204,10 +204,9 @@ connection (typically PORT) is kept open once data has been fetched from URI." (when (or (not port) (port-closed? port)) (set! port (guix:open-connection-for-uri uri #:verify-certificate? #f))) - (unless (or buffered? (not (file-port? port))) - (setvbuf port 'none)) (http-fetch uri #:text? #f #:port port #:keep-alive? keep-alive? + #:buffered? buffered? #:verify-certificate? #f)))))) (else (leave (G_ "unsupported substitute URI scheme: ~a~%") -- cgit v1.2.3