nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

status: Always print the daemon's "waiting for locks" messages. 

Reported by Ricardo Wurmus <rekado@elephly.net>.

* guix/status.scm (print-build-event) <build-log>: Let "waiting for
locks" messages through.
This commit is contained in:
Ludovic Courtès 2018-09-30 21:57:59 +02:00
parent 0e2d3ce20e
commit f9051e3870
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
guix/status.scm
View File

@ -383,14 +383,20 @@ addition to build events."
actual hash: ~a~%"))
expected actual))
(('build-log line)
;; The daemon prefixes early messages coming with 'guix substitute' with
;; "substitute:". These are useful ("updating substitutes from URL"), so
;; let them through.
(if (string-prefix? "substitute: " line)
(begin
(format port line)
(force-output port))
(print-log-line line)))
;; TODO: Better distinguish daemon messages and build log lines.
(cond ((string-prefix? "substitute: " line)
;; The daemon prefixes early messages coming with 'guix
;; substitute' with "substitute:". These are useful ("updating
;; substitutes from URL"), so let them through.
(format port line)
(force-output port))
((string-prefix? "waiting for locks" line)
;; This is when a derivation is already being built and we're just
;; waiting for the build to complete.
(display (info (string-trim-right line)) port)
(newline))
(else
(print-log-line line))))
(_
event)))