summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-12-06 00:50:08 +0100
committerLudovic Courtès <ludo@gnu.org>2016-12-06 00:50:08 +0100
commit0237d7971742ccfe5670455debb1feca9a491a0f (patch)
tree2456ae7f6d40bf043b130ce00d81950ce940a600
parent8243951ef1b9de902bfd719e40759d62696b8050 (diff)
downloadguix-0237d7971742ccfe5670455debb1feca9a491a0f.tar.gz
offload: Send the build log to the right file descriptor.
This fixes a regression introduced in
21531add3205e400707c8fbfd841845f9a71863a whereby the build log would no
longer be sent to FD 4, thereby leading the daemon to not see the build
log.

* guix/scripts/offload.scm (transfer-and-offload): Parameterize
CURRENT-BUILD-OUTPUT-PORT.
-rw-r--r--guix/scripts/offload.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/scripts/offload.scm b/guix/scripts/offload.scm
index ed70f2267a..55d4c93c64 100644
--- a/guix/scripts/offload.scm
+++ b/guix/scripts/offload.scm
@@ -390,7 +390,8 @@ MACHINE."
              ;; Use exit code 100 for a permanent build failure.  The daemon
              ;; interprets other non-zero codes as transient build failures.
              (primitive-exit 100)))
-    (build-derivations store (list drv)))
+    (parameterize ((current-build-output-port (build-log-port)))
+      (build-derivations store (list drv))))
 
   (retrieve-files outputs store)
   (format (current-error-port) "done with offloaded '~a'~%"