From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 10 17:09:00 2022 Received: (at submit) by debbugs.gnu.org; 10 Feb 2022 22:09:00 +0000 Received: from localhost ([127.0.0.1]:57403 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIHcZ-0007wD-Q2 for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:08:59 -0500 Received: from lists.gnu.org ([209.51.188.17]:43220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIHcY-0007w4-4q for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:08:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIHcX-00015o-U6 for guix-patches@gnu.org; Thu, 10 Feb 2022 17:08:57 -0500 Received: from [2001:470:142:3::e] (port=38138 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIHcL-0002xP-QP; Thu, 10 Feb 2022 17:08:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=ZTRXB5jcErk39ke0tkk2CedIoXDwle2CVQkSpne2j6A=; b=PXPfHFgVmNM6h4 E4nCSxGZyy4mQ5QbwdtWpmiFjgGnn8gr4DjBz8k3ryvzNWxsctgrbColNAopAQQg3ZNU6sw2kyTeo 81J2ADR6BIOp0uN2IXA/CqSjdHdlwgkthNT2xMftYhFTCQNGUYQJRy1WYqvqDhND4+fnIMn83httR 236hFgrglinHgLOElwKt0oz4dfoT7s3zpPMv4EcYwRWgIddxG3LdAg7OmkFrHRxS7v67ftEK4ALWO xpPrFwqHh8CL4NeWRJCP1N3sTrnpy/8wclFHqu3SWujFTmS43O3VvJDujIqozF5P+uqdMiAqwlAun rkm2IyRmSNXknmWwzbbQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:56744 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIHcL-0006Ut-DT; Thu, 10 Feb 2022 17:08:45 -0500 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: guix-patches@gnu.org Subject: [PATCH 0/3] Tweak build output coming from (guix status) Date: Thu, 10 Feb 2022 23:08:36 +0100 Message-Id: <20220210220836.22022-1-ludo@gnu.org> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! Here are cosmetic changes to improve the way things get printed. Feedback welcome! Ludo’. Ludovic Courtès (3): status: Do not print .drv file names for grafts. status: Use bold more sparsely at -v1. status: Do not pass a non-literal format string to 'format'. guix/status.scm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) base-commit: 0e103ec611acb25966bedc7ac9537b34f0a53306 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 10 17:17:19 2022 Received: (at 53933) by debbugs.gnu.org; 10 Feb 2022 22:17:20 +0000 Received: from localhost ([127.0.0.1]:57414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIHkd-0008Au-JU for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:17:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48650) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIHkb-0008AQ-Qg for 53933@debbugs.gnu.org; Thu, 10 Feb 2022 17:17:18 -0500 Received: from [2001:470:142:3::e] (port=38436 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIHkK-0005qy-Gr; Thu, 10 Feb 2022 17:17:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=Iq5AEDtUzcClJFC33z+fLrBPimWSpUmxcNU8KeTcnxY=; b=W5ezITxe4BtjLo wzafqC5hSnoGHklIBO8pRTu47ubCbXtdhGAILWawf1eOrV4C7UcJecx1hvbh5eHcGsocr8DSv2mFp nXI6u6Oo4l2KsZc5OLlALGlsCYYKqmSVnp0Tdl5h6Zudu/0NGI5SKOVrwKvNM70OArhiwNrTiKfpa LKGR0FiiyYaw/2wuoUkLt1S0GjVTlxNlejRyFN2X5OR3qApQoZzE7vtKDVpq2CVOMDQAwhxi9s/la Ugb+T5g+SNvK1p30GbDTQke2tEAVEKbr9CPzy20nHW+nX7fCGqHPGTWhQGs5yS1L+ZmNWpjkm1lge 1fXBOSdJQvN21UAw6Aqw==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=41412 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIHkK-0007Lk-3q; Thu, 10 Feb 2022 17:17:00 -0500 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 53933@debbugs.gnu.org Subject: [PATCH 1/3] status: Do not print .drv file names for grafts. Date: Thu, 10 Feb 2022 23:16:51 +0100 Message-Id: <20220210221653.22208-1-ludo@gnu.org> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53933 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) With this change, "guix build vim-full" prints: applying 15 grafts for vim-full-8.2.4306 ... instead of showing /gnu/store/…-vim-full-8.2.4306.drv. * guix/status.scm (print-build-event): In the 'graft' case, print just the "package name" part of DRV. --- guix/status.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/status.scm b/guix/status.scm index fba28765df..868f6d6296 100644 --- a/guix/status.scm +++ b/guix/status.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2017-2022 Ludovic Courtès ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. @@ -483,7 +483,9 @@ (define erase-current-line* (format port (info (N_ "applying ~a graft for ~a ..." "applying ~a grafts for ~a ..." count)) - count drv))) + count + (string-drop-right (store-path-package-name drv) + (string-length ".drv"))))) ('profile (let ((count (match (assq-ref properties 'profile) (#f 0) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 10 17:17:20 2022 Received: (at 53933) by debbugs.gnu.org; 10 Feb 2022 22:17:20 +0000 Received: from localhost ([127.0.0.1]:57416 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIHkd-0008Aw-Sn for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:17:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIHkb-0008AP-QP for 53933@debbugs.gnu.org; Thu, 10 Feb 2022 17:17:18 -0500 Received: from [2001:470:142:3::e] (port=38438 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIHkL-0005r4-8T; Thu, 10 Feb 2022 17:17:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=AbqfGxZtlPDo/elDFN466lBX99NZrsWpjHLsklu4Eas=; b=ZWlL/tOdjN4dZp+TPjw+ o9S1+lUZHsY1ggm9vXKkLz8TrPQY2jzPGVmO82P4RRIyHaaczIXivo+EJlP8PleNsw6CUofkZFp5V KHaA5n7tLrbpJ95dYnFWXjdo157yIQ20Jnu9/PhRB6+7AZ7UyliesqQ+gC7YaSbIIJArsI+0/Wo+h q4gJmUKy/q85O+8TxBP3JntkLq1mOF7cKIqd2bMMQieKUj6Gj1tsX+vKDmctTBFJ93RtyWjGsKz37 UJgUl75T/orXEhLAFW2NGiAJ03ffk5y7ymoWfWfEEnO1lqCWlCnIWMz/VQPAgHm4b9pbOy/1PGp4X JDa4KkDu111r8A==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=41412 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIHkK-0007Lk-Ps; Thu, 10 Feb 2022 17:17:01 -0500 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 53933@debbugs.gnu.org Subject: [PATCH 2/3] status: Use bold more sparsely at -v1. Date: Thu, 10 Feb 2022 23:16:52 +0100 Message-Id: <20220210221653.22208-2-ludo@gnu.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210221653.22208-1-ludo@gnu.org> References: <20220210221653.22208-1-ludo@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53933 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Until now, at -v1, all the "apply N grafts" messages (for instance) would be displayed in bold. This would typically result in several subsequent lines all bold, although none of them is particularly interesting. This improves on that by avoiding bold at -v1 for these messages. * guix/status.scm (print-build-event)[emph]: New variable. Use it for the "View build log", "expected hash", and "offloading build" messages. [info]: Default to 'identity' when PRINT-URLS? and PRINT-LOG? are both false. --- guix/status.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/guix/status.scm b/guix/status.scm index 868f6d6296..5b903372f1 100644 --- a/guix/status.scm +++ b/guix/status.scm @@ -414,6 +414,11 @@ (define* (print-build-event event old-status status addition to build events. When PRINT-URLS? is true, display the URL of substitutes being downloaded." (define info + (if (and colorize? (or print-urls? print-log?)) + (cute colorize-string <> (color BOLD)) + identity)) + + (define emph (if colorize? (cute colorize-string <> (color BOLD)) identity)) @@ -526,7 +531,7 @@ (define erase-current-line* (format port (failure (G_ "Could not find build log for '~a'.")) drv)) (log - (format port (info (G_ "View build log at '~a'.")) log))) + (format port (emph (G_ "View build log at '~a'.")) log))) (newline port)) (('substituter-started item _ ...) (erase-current-line*) @@ -577,12 +582,12 @@ (define erase-current-line* ;; /gnu/store/…-sth:", where "sha256" is the hash algorithm. (format port (failure (G_ "~a hash mismatch for ~a:")) algo item) (newline port) - (format port (info (G_ "\ + (format port (emph (G_ "\ expected hash: ~a actual hash: ~a~%")) expected actual)) (('build-remote drv host _ ...) - (format port (info (G_ "offloading build of ~a to '~a'")) drv host) + (format port (emph (G_ "offloading build of ~a to '~a'")) drv host) (newline port)) (('build-log pid line) (if (multiplexed-output-supported?) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 10 17:17:23 2022 Received: (at 53933) by debbugs.gnu.org; 10 Feb 2022 22:17:23 +0000 Received: from localhost ([127.0.0.1]:57418 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIHkh-0008BE-A5 for submit@debbugs.gnu.org; Thu, 10 Feb 2022 17:17:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nIHkb-0008AR-Qm for 53933@debbugs.gnu.org; Thu, 10 Feb 2022 17:17:18 -0500 Received: from [2001:470:142:3::e] (port=38440 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIHkL-0005rz-Ss; Thu, 10 Feb 2022 17:17:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=2f1VYeTi45m+8cK0wd+oWDDdoBGUIPmagI+UHQydF68=; b=BAEoPupCWqYCBrWjTD1i SlPbIHPfx49MYs7ZZRotHq/DTAzh/QNhi+YhagxpLew4sbwotwBqki/3Z2tOpx7nD94HI2UgpiMeC Za2xSF8o7UtZR7oEQeQcZeHxe0go8/FdlgUVy4S3SMmeOif7Z/+nuX9HTxVoqN4WoG8xX3OD13Z2i ph+6L3vh/tkIjsdXqJAMMAfDrv4LNW0CCTUkqqPncSYzHtT3mSnY+Il7b2USAa+UWMBod9m0xcwVp lJJ3s59elsZD6hGKsO+FKS9bqMdBSXGQ9bwYMxecDwfoE1AtvxvJ6KcQfF1EHGV4pHCn+7zLUHXpd /eoDlCjIEcc3Lg==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=41412 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nIHkL-0007Lk-HF; Thu, 10 Feb 2022 17:17:01 -0500 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 53933@debbugs.gnu.org Subject: [PATCH 3/3] status: Do not pass a non-literal format string to 'format'. Date: Thu, 10 Feb 2022 23:16:53 +0100 Message-Id: <20220210221653.22208-3-ludo@gnu.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220210221653.22208-1-ludo@gnu.org> References: <20220210221653.22208-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53933 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * guix/status.scm (print-build-event): Use 'display' instead of 'format' for hooks. --- guix/status.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/status.scm b/guix/status.scm index 5b903372f1..b8905c9542 100644 --- a/guix/status.scm +++ b/guix/status.scm @@ -503,7 +503,7 @@ (define erase-current-line* (let ((hook-type (assq-ref properties 'hook))) (or (and=> (hook-message hook-type) (lambda (msg) - (format port (info msg)))) + (display (info msg) port))) (format port (info (G_ "running profile hook of type '~a'...")) hook-type)))) (_ -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 16 11:02:47 2022 Received: (at 53933-done) by debbugs.gnu.org; 16 Feb 2022 16:02:47 +0000 Received: from localhost ([127.0.0.1]:49288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nKMlS-00021T-Q3 for submit@debbugs.gnu.org; Wed, 16 Feb 2022 11:02:46 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:60244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nKMlR-00021H-DS for 53933-done@debbugs.gnu.org; Wed, 16 Feb 2022 11:02:46 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 8E1AFA27 for <53933-done@debbugs.gnu.org>; Wed, 16 Feb 2022 17:02:39 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j4NLQaj5sExk for <53933-done@debbugs.gnu.org>; Wed, 16 Feb 2022 17:02:38 +0100 (CET) Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 8350B57B for <53933-done@debbugs.gnu.org>; Wed, 16 Feb 2022 17:02:38 +0100 (CET) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: 53933-done@debbugs.gnu.org Subject: Re: bug#53933: [PATCH 0/3] Tweak build output coming from (guix status) References: <20220210220836.22022-1-ludo@gnu.org> Date: Wed, 16 Feb 2022 17:02:38 +0100 In-Reply-To: <20220210220836.22022-1-ludo@gnu.org> ("Ludovic =?utf-8?Q?Cou?= =?utf-8?Q?rt=C3=A8s=22's?= message of "Thu, 10 Feb 2022 23:08:36 +0100") Message-ID: <87k0duvly9.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: / Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Server: hera X-Rspamd-Queue-Id: 8E1AFA27 X-Spamd-Result: default: False [-0.10 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[53933-done@debbugs.gnu.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 53933-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Ludovic Court=C3=A8s skribis: > status: Do not print .drv file names for grafts. > status: Use bold more sparsely at -v1. > status: Do not pass a non-literal format string to 'format'. Pushed as 5d4d8d83e4aa6db2e0a325e2ffb915c12fe5234d. Ludo=E2=80=99. From unknown Sat Jun 14 03:47:51 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 17 Mar 2022 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator