diff options
| author | Christopher Baines <mail@cbaines.net> | 2021-03-15 16:05:24 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2021-03-16 22:58:01 +0000 |
| commit | fc0b14a93ef42a3afa179ae6d28c754538251c0d (patch) | |
| tree | 69504680e80b36cb180eb7538ea8a7f5ed0fe306 | |
| parent | 9e008fd6e15eba4c73b575ca8897d9976ed0f28a (diff) | |
| download | guix-add-back-some-substitution-error-handling.tar guix-add-back-some-substitution-error-handling.tar.gz | |
scripts: substitute: Tweak error reporting in process-substitution.add-back-some-substitution-error-handling
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.
| -rwxr-xr-x | guix/scripts/substitute.scm | 13 |
1 files 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))))) |