[no subject]

[Ludovic Courtès]

branch: master
commit c5487cafabea43b8f1ed3ea5068a7463c15d813a
Author: Ludovic Courtès <address@hidden>
Date:   Tue Nov 6 18:06:41 2018 +0100

    base: Disable builder output.
    
    * src/cuirass/base.scm (with-store): Pass #:build-verbosity to
    'set-build-options'.
---
 src/cuirass/base.scm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/cuirass/base.scm b/src/cuirass/base.scm
index cd095e0..35e748d 100644
--- a/src/cuirass/base.scm
+++ b/src/cuirass/base.scm
@@ -74,12 +74,15 @@
     (unwind-protect
      ;; Always set #:keep-going? so we don't stop on the first build failure.
      ;; Set #:print-build-trace explicitly to make sure 'process-build-log'
-     ;; sees build events.
+     ;; sees build events; set #:build-verbosity 1 so that we don't receive
+     ;; output from the builders (that is, we only get build traces, nothing
+     ;; more), which in turn makes sure we can correctly process build traces.
      (set-build-options store
                         #:use-substitutes? (%use-substitutes?)
                         #:fallback? (%fallback?)
                         #:keep-going? #t
-                        #:print-build-trace #t)
+                        #:print-build-trace #t
+                        #:build-verbosity 1)
      exp ...
      (close-connection store))))
 
@@ -464,9 +467,9 @@ items."
   "Handle EVENT, a build event sexp as produced by 'build-event-output-port',
 updating the database accordingly."
   (define (valid? file)
-    ;; FIXME: Sometimes we might get bogus events due to the interleaving of
-    ;; build messages.  This procedure prevents us from propagating the bogus
-    ;; file name to the database.
+    ;; When builder output is turned off (build-verbosity = 1), we normally
+    ;; only see valid derivation file names in EVENT.  To be on the safe side,
+    ;; double-check that this is the case.
     (and (store-path? file)
          (string-suffix? ".drv" file)))