[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#45409] [PATCH v5 02/14] substitute: Remove connection handling from
From: |
Christopher Baines |
Subject: |
[bug#45409] [PATCH v5 02/14] substitute: Remove connection handling from fetch. |
Date: |
Sat, 13 Feb 2021 13:47:07 +0000 |
http-fetch does this, so just use that code instead.
* guix/scripts/substitute.scm (fetch): Remove connection handling when the
port is closed.
---
guix/scripts/substitute.scm | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index 88610a0781..323957910a 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -200,14 +200,10 @@ connection (typically PORT) is kept open once data has
been fetched from URI."
(warning (G_ "while fetching ~a: server is somewhat slow~%")
(uri->string uri))
(warning (G_ "try `--no-substitutes' if the problem persists~%")))
- (begin
- (when (or (not port) (port-closed? port))
- (set! port (guix:open-connection-for-uri
- uri #:verify-certificate? #f)))
- (http-fetch uri #:text? #f #:port port
- #:keep-alive? keep-alive?
- #:buffered? buffered?
- #:verify-certificate? #f))))))
+ (http-fetch uri #:text? #f #:port port
+ #:keep-alive? keep-alive?
+ #:buffered? buffered?
+ #:verify-certificate? #f)))))
(else
(leave (G_ "unsupported substitute URI scheme: ~a~%")
(uri->string uri)))))
--
2.30.0
- [bug#45409] [PATCH v5 01/14] substitute: Remove buffer handling from fetch., Christopher Baines, 2021/02/13
- [bug#45409] [PATCH v5 02/14] substitute: Remove connection handling from fetch.,
Christopher Baines <=
- [bug#45409] [PATCH v5 08/14] http-client: Accept #:open-connection in http-fetch., Christopher Baines, 2021/02/13
- [bug#45409] [PATCH v5 05/14] http-client: Add error handling to http-multiple-get., Christopher Baines, 2021/02/13
- [bug#45409] [PATCH v5 12/14] substitute: Inline fetch in to process-substitutes., Christopher Baines, 2021/02/13
- [bug#45409] [PATCH v5 14/14] substitute: Rework connection error handling., Christopher Baines, 2021/02/13
- [bug#45409] [PATCH v5 10/14] substitute: Remove now redundant connection caching helpers., Christopher Baines, 2021/02/13
- [bug#45409] [PATCH v5 06/14] substitute: open-connection-for-uri/maybe add #:verify-certificate?., Christopher Baines, 2021/02/13
- [bug#45409] [PATCH v5 07/14] substitute: Stop using call-with-cached-connection in fetch-narinfos., Christopher Baines, 2021/02/13
- [bug#45409] [PATCH v5 04/14] guix: Move http-multiple-get to (guix http-client)., Christopher Baines, 2021/02/13
- [bug#45409] [PATCH v5 09/14] substitute: Change connection cache handling in process-substitution., Christopher Baines, 2021/02/13
- [bug#45409] [PATCH v5 03/14] substitute: Remove redundant let block from fetch., Christopher Baines, 2021/02/13