[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#45409] [PATCH v4 03/13] substitute: Remove redundant let block from
From: |
Christopher Baines |
Subject: |
[bug#45409] [PATCH v4 03/13] substitute: Remove redundant let block from fetch. |
Date: |
Sat, 16 Jan 2021 13:57:53 +0000 |
* guix/scripts/substitute.scm (fetch): Remove redundant let block.
---
guix/scripts/substitute.scm | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index 74fce15117..ecc2bd9035 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -192,18 +192,17 @@ 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
- (let ((port port))
- (with-timeout (if timeout?
- %fetch-timeout
- 0)
- (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 #:port port
- #:keep-alive? keep-alive?
- #:buffered? buffered?
- #:verify-certificate? #f)))))
+ (with-timeout (if timeout?
+ %fetch-timeout
+ 0)
+ (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 #: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 v4 01/13] substitute: Remove buffer handling from fetch., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 02/13] substitute: Remove connection handling from fetch., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 04/13] guix: Move http-multiple-get to (guix http-client)., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 11/13] substitute: Remove redundant fetch arguments., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 05/13] http-client: Add error handling to http-multiple-get., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 06/13] substitute: open-connection-for-uri/maybe add #:verify-certificate?., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 07/13] substitute: Stop using call-with-cached-connection in fetch-narinfos., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 03/13] substitute: Remove redundant let block from fetch.,
Christopher Baines <=
- [bug#45409] [PATCH v4 10/13] substitute: Remove now redundant connection caching helpers., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 12/13] substitute: Inline fetch in to process-substitutes., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 08/13] http-client: Accept #:open-connection in http-fetch., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 13/13] substitute: Remove fetch-narinfos use open-connection-for-uri/maybe., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 09/13] substitute: Change connection cache handling in process-substitution., Christopher Baines, 2021/01/16