From patchwork Sun Mar 21 16:56:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 28001 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CE61127BC58; Sun, 21 Mar 2021 17:01:06 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CE55B27BC5C for ; Sun, 21 Mar 2021 16:58:54 +0000 (GMT) Received: from localhost ([::1]:57570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lO1O5-00022U-9b for patchwork@mira.cbaines.net; Sun, 21 Mar 2021 12:57:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lO1Nu-00022G-4N for guix-patches@gnu.org; Sun, 21 Mar 2021 12:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43801) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lO1Nt-0004Ti-TQ for guix-patches@gnu.org; Sun, 21 Mar 2021 12:57:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lO1Nt-0008IN-SN for guix-patches@gnu.org; Sun, 21 Mar 2021 12:57:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47295] [PATCH 1/2] substitute: Emit a single newline upon completion. References: <20210321163357.5786-1-ludo@gnu.org> In-Reply-To: <20210321163357.5786-1-ludo@gnu.org> Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Mar 2021 16:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47295 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47295@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 47295-submit@debbugs.gnu.org id=B47295.161634579231839 (code B ref 47295); Sun, 21 Mar 2021 16:57:01 +0000 Received: (at 47295) by debbugs.gnu.org; 21 Mar 2021 16:56:32 +0000 Received: from localhost ([127.0.0.1]:55344 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lO1NQ-0008HS-Iq for submit@debbugs.gnu.org; Sun, 21 Mar 2021 12:56:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lO1NK-0008HA-VO for 47295@debbugs.gnu.org; Sun, 21 Mar 2021 12:56:31 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41981) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lO1NE-00049M-UF; Sun, 21 Mar 2021 12:56:20 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=38628 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lO1NE-0005cv-8T; Sun, 21 Mar 2021 12:56:20 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 21 Mar 2021 17:56:03 +0100 Message-Id: <20210321165604.6426-1-ludo@gnu.org> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 f4042906c8..d0b4ef9fc2 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -551,8 +551,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)))