aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-03-21 17:20:10 +0100
committerLudovic Courtès <ludo@gnu.org>2021-03-31 15:57:46 +0200
commit1fa4aff1fbb46bbb9df8486ca12bfcfe6144458a (patch)
tree907f9451031d0c24bdde17f7c7f57d7f7ae1f2c1
parentf233bb170b072cf4801b2f229593b9680ea0224c (diff)
downloadguix-1fa4aff1fbb46bbb9df8486ca12bfcfe6144458a.tar
guix-1fa4aff1fbb46bbb9df8486ca12bfcfe6144458a.tar.gz
substitute: Emit a single newline upon completion.
The immediate effect is that, with '--verbosity=1', only two lines are displayed for each substitute, instead of two lines followed by an empty line. * guix/scripts/substitute.scm (process-substitution): Emit a single newline upon completion when PRINT-BUILD-TRACE? is true.
-rwxr-xr-xguix/scripts/substitute.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index ccdc4137e8..79eaabd8fd 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -555,8 +555,11 @@ the current output port."
(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))
+ ;; one to visually separate substitutions. When PRINT-BUILD-TRACE? is
+ ;; true, leave it up to (guix status) to prettify things.
+ (newline (current-error-port))
+ (unless print-build-trace?
+ (newline (current-error-port)))
;; Check whether we got the data announced in NARINFO.
(let ((actual (get-hash)))