diff options
author | Ludovic Courtès <ludo@gnu.org> | 2016-03-14 17:09:46 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2016-03-14 23:34:33 +0100 |
commit | cc27dbcf4af86bb073f1184e6186b2db96a479aa (patch) | |
tree | c191d1cc9bc93c1ee426f5125bca96b013a46620 | |
parent | f09aea1b58b3ef961d3cc712f116fe4617bc8f90 (diff) | |
download | patches-cc27dbcf4af86bb073f1184e6186b2db96a479aa.tar patches-cc27dbcf4af86bb073f1184e6186b2db96a479aa.tar.gz |
substitute: Remove dead code.
This parameter became unused with the switch to HTTP pipelining in
commit d3a652037ef879f9279bc056c43d15ba7afcbb25.
* guix/scripts/substitute.scm (fetch): Remove #:quiet-404? and adjust
accordingly.
-rwxr-xr-x | guix/scripts/substitute.scm | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index b057e9b12a..d20c82a770 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -164,10 +164,9 @@ again." (sigaction SIGALRM SIG_DFL) (apply values result))))) -(define* (fetch uri #:key (buffered? #t) (timeout? #t) (quiet-404? #f)) +(define* (fetch uri #:key (buffered? #t) (timeout? #t)) "Return a binary input port to URI and the number of bytes it's expected to -provide. If QUIET-404? is true, HTTP 404 error conditions are passed through -to the caller without emitting an error message." +provide." (case (uri-scheme uri) ((file) (let ((port (open-file (uri-path uri) @@ -175,12 +174,10 @@ to the caller without emitting an error message." (values port (stat:size (stat port))))) ((http https) (guard (c ((http-get-error? c) - (let ((code (http-get-error-code c))) - (if (and (= code 404) quiet-404?) - (raise c) - (leave (_ "download from '~a' failed: ~a, ~s~%") - (uri->string (http-get-error-uri c)) - code (http-get-error-reason c)))))) + (leave (_ "download from '~a' failed: ~a, ~s~%") + (uri->string (http-get-error-uri c)) + (http-get-error-code c) + (http-get-error-reason c)))) ;; Test this with: ;; sudo tc qdisc add dev eth0 root netem delay 1500ms ;; and then cancel with: |