aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-06-04 22:11:46 +0200
committerLudovic Courtès <ludo@gnu.org>2017-06-04 22:13:16 +0200
commit7f8029d33cfbc374bd00cae4d8a937dbdcc6696d (patch)
tree875c3753ba541b39292cc66908e96194ef40355b
parent870e8d6ad3415ac61c52e57095fcc6164023a0fc (diff)
downloadcuirass-7f8029d33cfbc374bd00cae4d8a937dbdcc6696d.tar
cuirass-7f8029d33cfbc374bd00cae4d8a937dbdcc6696d.tar.gz
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.
-rw-r--r--src/cuirass/base.scm11
1 files 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