[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/11: substitute: Emit a single newline upon completion.
From: |
guix-commits |
Subject: |
10/11: substitute: Emit a single newline upon completion. |
Date: |
Wed, 31 Mar 2021 10:01:47 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 1fa4aff1fbb46bbb9df8486ca12bfcfe6144458a
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Mar 21 17:20:10 2021 +0100
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.
---
guix/scripts/substitute.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index ccdc413..79eaabd 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)))
- branch master updated (04ba7a1 -> e45ef9a), guix-commits, 2021/03/31
- 01/11: tests: Make 'publish' test umask-insensitive., guix-commits, 2021/03/31
- 02/11: gnu: libvirt: Update to 7.1.0., guix-commits, 2021/03/31
- 05/11: gnu: virt-manager: Update to 3.2.0., guix-commits, 2021/03/31
- 03/11: gnu: python-libvirt: Update to 7.1.0., guix-commits, 2021/03/31
- 04/11: gnu: libvirt-glib: Update to 4.0.0., guix-commits, 2021/03/31
- 06/11: services: xorg: Export %default-xorg-server-arguments., guix-commits, 2021/03/31
- 10/11: substitute: Emit a single newline upon completion.,
guix-commits <=
- 07/11: services: sysctl: Export <sysctl-configuration> record field accessors., guix-commits, 2021/03/31
- 08/11: gnu: Remove unnecessary imports from (gnu packages gnome)., guix-commits, 2021/03/31
- 09/11: gnu: julia-commonsubexpressions: Fix Texinfo syntax., guix-commits, 2021/03/31
- 11/11: status: Don't display download URLs for '--verbosity=1'., guix-commits, 2021/03/31