futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

status: Separate downloads upon '--verbosity=2'.

Browse Source 
This is a followup to 1fa4aff1fb,
reintroducing the newline previously emitted by 'guix substitute' upon
download completion.

With this change, with '--verbosity=2', each download occupies three
lines again, like so:

--8<---------------cut here---------------start------------->8---
downloading from https://ci.guix.gnu.org/nar/lzip/…-jsoncpp-1.9.2 ...
 jsoncpp-1.9.2  93KiB                4.2MiB/s 00:00 [##################] 100.0%

--8<---------------cut here---------------end--------------->8---

This makes the output more readable.

* guix/status.scm (print-build-event): When PRINT-URLS? is true, print
a blank line after the download.
This commit is contained in:
Ludovic Courtès 2021-04-22 22:58:03 +02:00
parent 09ce4568f2
commit 64afc72962
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
guix/status.scm
View File

@ -552,12 +552,16 @@ substitutes being downloaded."
(download-start download)
#:transferred transferred))))))
(('substituter-succeeded item _ ...)
;; If there are no jobs running, we already reported download completion
;; so there's nothing left to do.
(unless (and (zero? (simultaneous-jobs status))
(extended-build-trace-supported?))
(format port (success (G_ "substitution of ~a complete")) item)
(newline port)))
(when (extended-build-trace-supported?)
;; If there are no jobs running, we already reported download completion
;; so there's nothing left to do.
(unless (zero? (simultaneous-jobs status))
(format port (success (G_ "substitution of ~a complete")) item))
(when (and print-urls? (zero? (simultaneous-jobs status)))
;; Leave a blank line after the "downloading ..." line and the
;; progress bar (that's three lines in total).
(newline port))))
(('substituter-failed item _ ...)
(format port (failure (G_ "substitution of ~a failed")) item)
(newline port))