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

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit f9051e387056fb1c29d8e67b76754168b304449d
Author: Ludovic Courtès <address@hidden>
Date:   Sun Sep 30 21:57:59 2018 +0200

    status: Always print the daemon's "waiting for locks" messages.
    
    Reported by Ricardo Wurmus <address@hidden>.
    
    * guix/status.scm (print-build-event) <build-log>: Let "waiting for
    locks" messages through.
---
 guix/status.scm | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/guix/status.scm b/guix/status.scm
index b19f019..c695606 100644
--- a/guix/status.scm
+++ b/guix/status.scm
@@ -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)))