summaryrefslogtreecommitdiff
path: root/guix/build
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2023-07-28 18:08:17 +0100
committerChristopher Baines <mail@cbaines.net>2023-07-28 18:08:17 +0100
commit3bb3fddb5c6e79056172e5858cdc0ee0b6b8cfaa (patch)
tree57a454b78d63abbeeed3bd6fee9bb24af2d7d6c5 /guix/build
parenta11107a3b2964ad4ea1eb8a6e0f065937a112806 (diff)
download-nar: Improve output.
Report errors that occur, output the "Downloading from " line before starting to report progress and end the output with a newline.
Diffstat (limited to 'guix/build')
-rw-r--r--guix/build/download-nar.scm33
1 files changed, 19 insertions, 14 deletions
diff --git a/guix/build/download-nar.scm b/guix/build/download-nar.scm
index 1b5b5503eb..3ba121b7fb 100644
--- a/guix/build/download-nar.scm
+++ b/guix/build/download-nar.scm
@@ -73,29 +73,34 @@ success, #f otherwise."
(catch #t
(lambda ()
(http-fetch (string->uri url)))
- (lambda args
+ (lambda (key . args)
+ (format #t "Unable to fetch from ~a, ~a: ~a~%"
+ (uri-host (string->uri url))
+ key
+ args)
(values #f #f)))))
(if (not port)
(loop rest)
- (let* ((reporter (progress-reporter/file
- url
- size
- (current-error-port)
- #:abbreviation nar-uri-abbreviation))
- (port-with-progress
- (progress-report-port reporter port
- #:download-size size)))
+ (begin
(if size
(format #t "Downloading from ~a (~,2h MiB)...~%" url
(/ size (expt 2 20.)))
(format #t "Downloading from ~a...~%" url))
- (if (string-contains url "/lzip")
- (restore-lzipped-nar port-with-progress
- item
- size)
- (begin
+ (let* ((reporter (progress-reporter/file
+ url
+ size
+ (current-error-port)
+ #:abbreviation nar-uri-abbreviation))
+ (port-with-progress
+ (progress-report-port reporter port
+ #:download-size size)))
+ (if (string-contains url "/lzip")
+ (restore-lzipped-nar port-with-progress
+ item
+ size)
(restore-file port-with-progress
item)))
+ (newline)
#t))))
(()
#f))))