cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore #:error-port when calling open-inferior

Browse source 
As the default is a void port.
This commit is contained in:
Christopher Baines 2023-11-05 16:12:55 +00:00
parent 1746256ef5
commit b2707b4828
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
guix-data-service/jobs/load-new-guix-revision.scm
View file

@ -970,7 +970,8 @@
"SSL_CERT_DIR=" (nss-certs-store-path store)))) "SSL_CERT_DIR=" (nss-certs-store-path store))))
(begin (begin
(simple-format #t "debug: using open-inferior\n") (simple-format #t "debug: using open-inferior\n")
(open-inferior (guix-store-path store)))))) (open-inferior (guix-store-path store)
#:error-port (current-error-port))))))
(define (start-inferior-and-return-derivation-file-names) (define (start-inferior-and-return-derivation-file-names)
;; /etc is only missing if open-inferior/container has been used ;; /etc is only missing if open-inferior/container has been used
@ -1100,7 +1101,8 @@
'("/gnu/store")) '("/gnu/store"))
(begin (begin
(simple-format #t "debug: using open-inferior\n") (simple-format #t "debug: using open-inferior\n")
(open-inferior store-path))))) (open-inferior store-path
#:error-port (current-error-port))))))
(inferior-eval '(use-modules (srfi srfi-1) (inferior-eval '(use-modules (srfi srfi-1)
(srfi srfi-34) (srfi srfi-34)
(guix grafts) (guix grafts)
@ -1155,7 +1157,8 @@
(begin (begin
(setenv "GUIX_LOCPATH" guix-locpath) (setenv "GUIX_LOCPATH" guix-locpath)
(simple-format #t "debug: using open-inferior\n") (simple-format #t "debug: using open-inferior\n")
(open-inferior store-path)))))) (open-inferior store-path
#:error-port (current-error-port)))))))
(setenv "GUIX_LOCPATH" guix-locpath) ; restore GUIX_LOCPATH (setenv "GUIX_LOCPATH" guix-locpath) ; restore GUIX_LOCPATH
(when (eq? inf #f) (when (eq? inf #f)