diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-02-10 17:25:08 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-04-03 17:18:38 +0100 |
| commit | ecbab97f0732d6979642078a7164d4032b2102b8 (patch) | |
| tree | a215299f452b673a80af3976b1145d10fd506a42 /guix | |
| parent | dcf0cca8d7d9771f0337e8a3b28653b9a459755d (diff) | |
| download | guix-ecbab97f0732d6979642078a7164d4032b2102b8.tar guix-ecbab97f0732d6979642078a7164d4032b2102b8.tar.gz | |
scripts: substitute: Replace some leave calls with raise.
These calls happen inside of with-error-handling, so the effect should be the
same, but this opens up the possibility of using this code in a program that
doesn't want to exit when one of these error conditions is met.
Change-Id: I15d963615d85d419559fa0f4333fa4dc1dfbfd3b
* guix/scripts/substitute.scm (download-nar, process-substitution): Use raise
formatted-message rather than leave.
Change-Id: Idd0880206b69e3903e19e0536b87d65a52c200d5
Diffstat (limited to 'guix')
| -rwxr-xr-x | guix/scripts/substitute.scm | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index aae6eddf3f..a7ad56dbcd 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -495,8 +495,10 @@ STATUS-PORT." #:keep-alive? #t #:buffered? #f)))) (else - (leave (G_ "unsupported substitute URI scheme: ~a~%") - (uri->string uri))))) + (raise + (formatted-message + (G_ "unsupported substitute URI scheme: ~a~%") + (uri->string uri)))))) (define (try-fetch choices) (match choices @@ -513,9 +515,11 @@ STATUS-PORT." (G_ "Downloading ~a...~%") (uri->string uri))) (values port uri compression download-size)))) (() - (leave (G_ "no valid nar URLs for ~a at ~a~%") - (narinfo-path narinfo) - (narinfo-uri-base narinfo))))) + (raise + (formatted-message + (G_ "no valid nar URLs for ~a at ~a~%") + (narinfo-path narinfo) + (narinfo-uri-base narinfo)))))) ;; Delete DESTINATION first--necessary when starting over after a failed ;; download. @@ -680,8 +684,10 @@ PORT." (cut valid-narinfo? <> acl)))) (unless narinfo - (leave (G_ "no valid substitute for '~a'~%") - store-item)) + (raise + (formatted-message + (G_ "no valid substitute for '~a'~%") + store-item))) (guard (c ((network-error? c) (when (http-get-error? c) |