From 7f8029d33cfbc374bd00cae4d8a937dbdcc6696d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 4 Jun 2017 22:11:46 +0200 Subject: base: Send build output to the bit bucket. Fixes a regression introduced in a42cf16fec114c26d16d5153053a2c6a1a3b1d11 whereby build logs would go the Cuirass' stderr. * src/cuirass/base.scm (build-packages): Parameterize 'current-build-output-port' to a void output port. --- src/cuirass/base.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/cuirass/base.scm b/src/cuirass/base.scm index 66c0088..fc3cc1a 100644 --- a/src/cuirass/base.scm +++ b/src/cuirass/base.scm @@ -153,12 +153,15 @@ if required. Return the last commit ID on success, #f otherwise." build)) ;; Pass all the jobs at once so we benefit from as much parallelism as - ;; possible (we must be using #:keep-going? #t). Swallow build errors. + ;; possible (we must be using #:keep-going? #t). Swallow build logs (the + ;; daemon keeps them anyway), and swallow build errors. (guard (c ((nix-protocol-error? c) #t)) (format #t "building ~a derivations...~%" (length jobs)) - (build-derivations store (map (λ (job) - (assq-ref job #:derivation)) - jobs))) + (parameterize ((current-build-output-port (%make-void-port "w"))) + (build-derivations store + (map (λ (job) + (assq-ref job #:derivation)) + jobs)))) ;; Register the results in the database. ;; XXX: The 'build-derivations' call is blocking so we end updating the -- cgit v1.2.3