mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-31 23:06:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

download: Restore error reporting.

Browse source 
Normal error reporting was disrupted by the introduction of
Disarchive in commit fbc2a52a32.  In
particular, running 'guix download' would succeed with a partially
downloaded file.

* guix/build/download.scm (disarchive-fetch/any): Return '#f' when
Disarchive cannot be found, the specification cannot be found, or
Disarchive fails due to an error.
This commit is contained in:
Timothy Sample 2021-05-05 23:10:25 -04:00
parent 0b77d36ad0
commit 7262619d6f
No known key found for this signature in database
GPG key ID: 2AC6A5EC1C357C59
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
guix/build/download.scm
View file

@ -662,14 +662,15 @@ (define (resolve addresses output)
(lambda (disarchive) (lambda (disarchive)
(cons (module-ref disarchive '%disarchive-log-port) (cons (module-ref disarchive '%disarchive-log-port)
(module-ref disarchive 'disarchive-assemble)))) (module-ref disarchive 'disarchive-assemble))))
(#f (#f (format #t "could not load Disarchive~%")
(format #t "could not load Disarchive~%")) #f)
((%disarchive-log-port . disarchive-assemble) ((%disarchive-log-port . disarchive-assemble)
(match (fetch-specification uris) (match (fetch-specification uris)
(#f (#f (format #t "could not find its Disarchive specification~%")
(format #t "could not find its Disarchive specification~%")) #f)
(spec (parameterize ((%disarchive-log-port (current-output-port))) (spec (parameterize ((%disarchive-log-port (current-output-port)))
(disarchive-assemble spec file #:resolver resolve))))))) (false-if-exception*
(disarchive-assemble spec file #:resolver resolve))))))))
(define* (url-fetch url file (define* (url-fetch url file
#:key #:key