diff options
| -rwxr-xr-x | guix/scripts/substitute.scm | 11 | ||||
| -rw-r--r-- | guix/utils.scm | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 921a7c6790..60dbdb1766 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -956,19 +956,22 @@ DESTINATION as a nar file. Verify the substitute against ACL." #:abbreviation nar-uri-abbreviation))) (progress-report-port reporter raw))) ((input pids) + ;; NOTE: This 'progress' port of current process will be + ;; closed here, while the child process doing the + ;; reporting will close it upon exit. (decompressed-port (and=> (narinfo-compression narinfo) string->symbol) progress))) ;; Unpack the Nar at INPUT into DESTINATION. (restore-file input destination) (close-port input) - (close-port progress) + + ;; Wait for the reporter to finish. + (every (compose zero? cdr waitpid) pids) ;; Skip a line after what 'progress-reporter/file' printed, and another ;; one to visually separate substitutions. - (display "\n\n" (current-error-port)) - - (every (compose zero? cdr waitpid) pids)))) + (display "\n\n" (current-error-port))))) ;;; diff --git a/guix/utils.scm b/guix/utils.scm index de4aa65319..2cf9be36df 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -153,9 +153,11 @@ buffered data is lost." (close-port in) (dump-port input out)) (lambda () + (close-port input) (false-if-exception (close out)) (primitive-_exit 0)))) (child + (close-port input) (close-port out) (loop in (cons child pids))))))))) |