[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#47160] [PATCH 2/2] scripts: substitute: Tweak error reporting in pr
From: |
Christopher Baines |
Subject: |
[bug#47160] [PATCH 2/2] scripts: substitute: Tweak error reporting in process-substitution. |
Date: |
Tue, 16 Mar 2021 23:46:28 +0000 |
The call-with-connection-error-handling was added in
20c08a8a45d0f137ead7c05e720456b2aea44402, but that error handling was
previously inside of open-connection-for-uri/maybe, which is related
to (call-)with-cached-connection which was used in process-substitution, but
only actually used with call-with-cached-connection when used in
fetch-narinfos.
There's some handling for similar errors within with-networking, which is used
within process-substitution.
* guix/scripts/substitute.scm (process-substitution): Remove
call-with-connection-error-handling call.
---
guix/scripts/substitute.scm | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index 812f2999ab..2bbbafe204 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -448,14 +448,11 @@ the current output port."
(warning (G_ "while fetching ~a: server is somewhat slow~%")
(uri->string uri))
(warning (G_ "try `--no-substitutes' if the problem persists~%")))
- (call-with-connection-error-handling
- uri
- (lambda ()
- (with-cached-connection uri port
- (http-fetch uri #:text? #f
- #:port port
- #:keep-alive? #t
- #:buffered? #f)))))))
+ (with-cached-connection uri port
+ (http-fetch uri #:text? #f
+ #:port port
+ #:keep-alive? #t
+ #:buffered? #f)))))
(else
(leave (G_ "unsupported substitute URI scheme: ~a~%")
(uri->string uri)))))
--
2.30.1
- [bug#47160] [PATCH] scripts: substitute: Add back some error handling., (continued)
[bug#47160] [PATCH v2 1/2] scripts: substitute: Add back some error handling., Christopher Baines, 2021/03/15
[bug#47160] [PATCH 1/2] scripts: substitute: Add back some error handling., Christopher Baines, 2021/03/16