guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: offload: Send the build log to the right file descriptor.


From: Ludovic Courtès
Subject: 01/02: offload: Send the build log to the right file descriptor.
Date: Tue, 6 Dec 2016 00:00:45 +0000 (UTC)

civodul pushed a commit to branch master
in repository guix.

commit 0237d7971742ccfe5670455debb1feca9a491a0f
Author: Ludovic Courtès <address@hidden>
Date:   Tue Dec 6 00:50:08 2016 +0100

    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.
---
 guix/scripts/offload.scm |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/offload.scm b/guix/scripts/offload.scm
index ed70f22..55d4c93 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'~%"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]