From 46c8ce5b82507b6b58429f3de28012ebe2f8694d Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Sat, 15 Feb 2020 13:41:17 +0000
Subject: Define a new parameter for a port used for the inferior error output

---
 guix-data-service/jobs/load-new-guix-revision.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index 349d40a..cf18c62 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -115,6 +115,9 @@
 (define real-error-port
   (make-parameter (current-error-port)))
 
+(define inferior-error-port
+  (make-parameter (current-error-port)))
+
 (define* (log-for-job conn job-id
                       #:key
                       character-limit
@@ -799,7 +802,7 @@ WHERE job_id = $1"
                (begin
                  (simple-format #t "debug: using open-inferior\n")
                  (open-inferior (guix-store-path store)
-                                #:error-port (real-error-port))))))
+                                #:error-port (inferior-error-port))))))
 
       (define (start-inferior-and-return-derivation-file-names)
         ;; /etc is only missing if open-inferior/container has been used
@@ -918,7 +921,7 @@ WHERE job_id = $1"
                  (begin
                    (simple-format #t "debug: using open-inferior\n")
                    (open-inferior store-path
-                                  #:error-port (real-error-port))))))
+                                  #:error-port (inferior-error-port))))))
     (inferior-eval '(use-modules (srfi srfi-1)
                                  (srfi srfi-34)
                                  (guix grafts)
@@ -977,7 +980,7 @@ WHERE job_id = $1"
                       (setenv "GUIX_LOCPATH" guix-locpath)
                       (simple-format #t "debug: using open-inferior\n")
                       (open-inferior store-path
-                                     #:error-port (real-error-port)))))))
+                                     #:error-port (inferior-error-port)))))))
     (setenv "GUIX_LOCPATH" guix-locpath) ; restore GUIX_LOCPATH
 
     (when (eq? inf #f)
@@ -1547,7 +1550,8 @@ SKIP LOCKED")
                               (set-current-error-port logging-port)
                               (let ((result
                                      (parameterize ((current-build-output-port logging-port)
-                                                    (real-error-port previous-error-port))
+                                                    (real-error-port previous-error-port)
+                                                    (inferior-error-port previous-error-port))
                                        (catch #t
                                          (lambda ()
                                            (with-store-connection
-- 
cgit v1.2.3