X-Loop: help-debbugs@HIDDEN
Subject: [bug#74878] [PATCH 0/2] Improve Guix Subsitute script usage.
Resent-From: Richard Sent <richard@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN
Resent-Date: Sun, 15 Dec 2024 00:26:01 +0000
Resent-Message-ID: <handler.74878.B.17342223064036 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 74878
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74878 <at> debbugs.gnu.org
Cc: Richard Sent <richard@HIDDEN>, Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
X-Debbugs-Original-To: guix-patches@HIDDEN
X-Debbugs-Original-Xcc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Received: via spool by submit <at> debbugs.gnu.org id=B.17342223064036
(code B ref -1); Sun, 15 Dec 2024 00:26:01 +0000
Received: (at submit) by debbugs.gnu.org; 15 Dec 2024 00:25:06 +0000
Received: from localhost ([127.0.0.1]:48836 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tMcRV-00012i-En
for submit <at> debbugs.gnu.org; Sat, 14 Dec 2024 19:25:05 -0500
Received: from lists.gnu.org ([209.51.188.17]:38592)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <richard@HIDDEN>) id 1tMcRQ-00010s-G9
for submit <at> debbugs.gnu.org; Sat, 14 Dec 2024 19:25:03 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <richard@HIDDEN>)
id 1tMcRQ-0001xp-5O
for guix-patches@HIDDEN; Sat, 14 Dec 2024 19:25:00 -0500
Received: from mail-108-mta87.mxroute.com ([136.175.108.87])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <richard@HIDDEN>)
id 1tMcRO-00049b-28
for guix-patches@HIDDEN; Sat, 14 Dec 2024 19:24:59 -0500
Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com)
(Authenticated sender: mN4UYu2MZsgR)
by mail-108-mta87.mxroute.com (ZoneMTA) with ESMTPSA id 193c7b420fb0003e01.001
for <guix-patches@HIDDEN>
(version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
Sun, 15 Dec 2024 00:24:51 +0000
X-Zone-Loop: 0867106675e42a653dd83e613b0e2e8c92b5d0d48465
X-Originating-IP: [136.175.111.3]
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
d=freakingpenguin.com; s=x; h=Content-Transfer-Encoding:MIME-Version:
Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:
Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc
:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:
List-Subscribe:List-Post:List-Owner:List-Archive;
bh=HbTSY4accNNvwaj5F1OJkGCfGOBPJhoEatlK87bkgD0=; b=FrC1AvtgaPKU13QnKbl0XNNDPo
K24UDxtpgPfL4/cJmh2VBq8xZHobo71oKpLi8NtUwMZ5T02lBm8Z4DbP5JCq57YlACAYirVAKyZzo
c3OXIBk4aipvQ5yhMEXsN2NGYZF/qFbQI/ydJB4v/NUSsqQU22jBzEwHbXuEfZTHo6d2aK5PMd0Ql
4CzTcDFmKZePfGdEXA0qc9i2vOR0lkgIzo5Dl01F85WhA7f4vIrHNqY+abI23qqqXTg528sEzEWPp
h7qKCrrhhlCTGK8lEKOfS6ngYZey0FaIsLDTPlO+PDckEVmD/6mU5rGq1dZcLKG0oZ6OFfVcQwTav
13nNlmTQ==;
From: Richard Sent <richard@HIDDEN>
Date: Sat, 14 Dec 2024 19:23:35 -0500
Message-ID: <cover.1734221404.git.richard@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Authenticated-Id: richard@HIDDEN
Received-SPF: pass client-ip=136.175.108.87;
envelope-from=richard@HIDDEN; helo=mail-108-mta87.mxroute.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.4 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.4 (--)
Hi all,
A common question I hear is "why is guix updating substitutes so many
times". My thinking is by adding the number of substitutes being updated to
guix/scripts/substitute.scm, it might be a bit clearer that something
different is happening every time.
(This was a very "fun" adventure. Originally I used ~:*~p to refer to the
previous argument, but that emits a warning in Guile because
format-string-argument-count doesn't seem to handle ~:*. Fortunately a commit
[1] by Ludo in 2014 showed me I could use ~:p instead.)
I also tweaked the help output since I found it a bit unclear. I know it's an
internal tool, but unless I'm missing something (I very may be) the previous
help output seemed almost misleading.
Note that if anyone tests this you won't see any changes in regular guix CLI
usage unless/until the guix package proper is updated. Instead, you can use
commands like:
echo "have /gnu/store/0zahq56kff8cfrq9xhkq5wi2zdkysj6b-emacs-29.1" | guix substitute --query
[1]: 8ac39b38
Richard Sent (2):
scripts: substitute: Report the number of substitutes being updated.
scripts: substitute: Improve the help output.
guix/scripts/substitute.scm | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
base-commit: 64ac17035d66d98d3081bc7fc558c33e1be8e4f4
--
2.46.0
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Richard Sent <richard@HIDDEN> Subject: bug#74878: Acknowledgement ([PATCH 0/2] Improve Guix Subsitute script usage.) Message-ID: <handler.74878.B.17342223064036.ack <at> debbugs.gnu.org> References: <cover.1734221404.git.richard@HIDDEN> X-Gnu-PR-Message: ack 74878 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 74878 <at> debbugs.gnu.org Date: Sun, 15 Dec 2024 00:26:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. As you requested using X-Debbugs-CC, your message was also forwarded to Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>,= Ludovic Court=C3=A8s <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, = Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@tobias= .gr> (after having been given a bug report number, if it did not have one). Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 74878 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 74878: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D74878 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN
Subject: [bug#74878] [PATCH 2/2] scripts: substitute: Improve the help output.
Resent-From: Richard Sent <richard@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN
Resent-Date: Sun, 15 Dec 2024 00:28:02 +0000
Resent-Message-ID: <handler.74878.B74878.17342224564587 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74878
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74878 <at> debbugs.gnu.org
Cc: Richard Sent <richard@HIDDEN>, Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
X-Debbugs-Original-Xcc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Received: via spool by 74878-submit <at> debbugs.gnu.org id=B74878.17342224564587
(code B ref 74878); Sun, 15 Dec 2024 00:28:02 +0000
Received: (at 74878) by debbugs.gnu.org; 15 Dec 2024 00:27:36 +0000
Received: from localhost ([127.0.0.1]:48850 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tMcTt-0001Br-8q
for submit <at> debbugs.gnu.org; Sat, 14 Dec 2024 19:27:36 -0500
Received: from mail-108-mta59.mxroute.com ([136.175.108.59]:33445)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <richard@HIDDEN>) id 1tMcTr-0001Bd-8Z
for 74878 <at> debbugs.gnu.org; Sat, 14 Dec 2024 19:27:32 -0500
Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com)
(Authenticated sender: mN4UYu2MZsgR)
by mail-108-mta59.mxroute.com (ZoneMTA) with ESMTPSA id 193c7b68e050003e01.001
for <74878 <at> debbugs.gnu.org>
(version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
Sun, 15 Dec 2024 00:27:30 +0000
X-Zone-Loop: 86f86678cc647a0ee71a6a21b5e766b9bb7a67f8dacb
X-Originating-IP: [136.175.111.3]
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
d=freakingpenguin.com; s=x; h=Content-Transfer-Encoding:MIME-Version:
References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:
Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From:
Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:
List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive;
bh=W9doXzuMZ2PVew1PlJ1QeyxuWE+Qmg8HwIxf5GhAtSY=; b=BQjTuoEWP8MHLss15+Wx4AgEty
vGDzfG3CvEckBUuVj3B2nPPvxlU2ayvDXhd3jTOYkcO3rDemGlKsWTt69g5uFtmfU1yYrKP6UqySX
Q0dl9WZbFULVAmXQIPwFQYrUFwv5hJFR5BX8807ZXNcgFkmX9NQlFbN309GnWVenFBwSJ4v+jqVRI
8K4S0X93SCrq/Mnra2bBm+XDeKDam9EYUaQx0g4JIr+qm8dQmlHtKkDstKLrXCZUDu5q7dq1xEHl4
ctL6sJnhEpVX3x3RvWhsvM9M6O4K09M9ZiGuf1DkXJyz1J1sGR2YVyk/SjW8JE7P9EC/j+61t1uV/
IE+wPGmA==;
From: Richard Sent <richard@HIDDEN>
Date: Sat, 14 Dec 2024 19:26:47 -0500
Message-ID: <abc5d45c178b0a00f778af8bc4847c34ed3c70fd.1734221404.git.richard@HIDDEN>
In-Reply-To: <cover.1734221404.git.richard@HIDDEN>
References: <cover.1734221404.git.richard@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Authenticated-Id: richard@HIDDEN
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Clarify that arguments are read from standard input and that --query expects a
command.
* guix/scripts/substitute.scm (show-help): Reword.
Change-Id: Ifc197d5e10e43663f1e05039ce29086f6a21b943
---
guix/scripts/substitute.scm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index 08ec172675..d5c2a84c33 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -244,13 +244,16 @@ (define-syntax with-networking
(define (show-help)
(display (G_ "Usage: guix substitute OPTION [ARGUMENT]...
-Internal tool to substitute a pre-built binary to a local build.\n"))
+Internal tool to substitute a pre-built binary to a local build.
+
+ARGUMENT is read from standard input, not from the command line.\n"))
(display (G_ "
- --query report on the availability of substitutes for the
- store file names passed on the standard input"))
+ --query COMMAND STORE-FILE ...
+ Run query COMMAND with STORE-FILE to report on
+ the availability of substitutes"))
(display (G_ "
--substitute STORE-FILE DESTINATION
- download STORE-FILE and store it as a Nar in file
+ download STORE-FILE and store it as a nar in file
DESTINATION"))
(newline)
(display (G_ "
--
2.46.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#74878] [PATCH 1/2] scripts: substitute: Report the number of substitutes being updated.
Resent-From: Richard Sent <richard@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN
Resent-Date: Sun, 15 Dec 2024 00:28:03 +0000
Resent-Message-ID: <handler.74878.B74878.17342224574594 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74878
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74878 <at> debbugs.gnu.org
Cc: Richard Sent <richard@HIDDEN>, Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
X-Debbugs-Original-Xcc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Received: via spool by 74878-submit <at> debbugs.gnu.org id=B74878.17342224574594
(code B ref 74878); Sun, 15 Dec 2024 00:28:03 +0000
Received: (at 74878) by debbugs.gnu.org; 15 Dec 2024 00:27:37 +0000
Received: from localhost ([127.0.0.1]:48852 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tMcTw-0001Bw-L6
for submit <at> debbugs.gnu.org; Sat, 14 Dec 2024 19:27:36 -0500
Received: from mail-108-mta241.mxroute.com ([136.175.108.241]:34111)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <richard@HIDDEN>) id 1tMcTr-0001Bc-9Y
for 74878 <at> debbugs.gnu.org; Sat, 14 Dec 2024 19:27:32 -0500
Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com)
(Authenticated sender: mN4UYu2MZsgR)
by mail-108-mta241.mxroute.com (ZoneMTA) with ESMTPSA id
193c7b6896e0003e01.001 for <74878 <at> debbugs.gnu.org>
(version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
Sun, 15 Dec 2024 00:27:29 +0000
X-Zone-Loop: 36b8ea912e7a39a46be1700b3efaa1e9cd73eb99bee3
X-Originating-IP: [136.175.111.3]
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
d=freakingpenguin.com; s=x; h=Content-Transfer-Encoding:MIME-Version:
References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:
Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From:
Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:
List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive;
bh=trLIytZyzeRRY8kofF2FPhW2GGFVVqkwZIreFFBfTCI=; b=KO9TwjOBymFjr54/ZaB+oH/te+
7cvN+NizysX8TvIg2ROI2sx3l4orjf3sYD64WXFgz8KE8Smx+xm1xD/uH+d1Rn8gGfa/PP6EOwX9G
NfF7+KrSl2SiWuMjsOn5kmV4SxuncHf1pmUDNdkw15GgcuDnG0pcYnaNz2YsnWaX1jVEGGrFyJTRR
Mt8baGkvi5IZHzjos1+SqfY1uMv9bn1td8fLnWS75yzyKMuJZ99viXm9khjOZl0oNyh+sOpxxjL+u
0Vvxxk3Uel1uZYMXmeuJYwp0jw0Rcv5uKTvhU93OFIQMA6IRBY4hKnZEKdLWz/53QgfHeG5dWRTtM
FcLgm3TQ==;
From: Richard Sent <richard@HIDDEN>
Date: Sat, 14 Dec 2024 19:26:46 -0500
Message-ID: <c8eddb560d8aef176d71fede1873dcb03e2f82bd.1734221404.git.richard@HIDDEN>
In-Reply-To: <cover.1734221404.git.richard@HIDDEN>
References: <cover.1734221404.git.richard@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Authenticated-Id: richard@HIDDEN
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/scripts/substitute.scm (process-query)[make-progress-reporter]: Report
the total number of substitutes.
Change-Id: I00c6fe7383a6093ce0567c0f391e613d36a563bc
---
guix/scripts/substitute.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index 8db730a9c0..08ec172675 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -328,8 +328,8 @@ (define* (process-query port command
(erase-current-line (current-error-port)) ;erase current line
(force-output (current-error-port))
(format (current-error-port)
- (G_ "updating substitutes from '~a'... ~5,1f%")
- url (* 100. (/ done total)))
+ (G_ "updating ~d substitute~:p from '~a'... ~5,1f%")
+ total url (* 100. (/ done total)))
(set! done (+ 1 done)))
(progress-reporter
--
2.46.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#74878] [PATCH 2/2] scripts: substitute: Improve the help output.
Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 23 Dec 2024 17:40:02 +0000
Resent-Message-ID: <handler.74878.B74878.17349755613240 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74878
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Richard Sent <richard@HIDDEN>
Cc: Josselin Poiret <dev@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>, 74878 <at> debbugs.gnu.org, Christopher Baines <guix@HIDDEN>
Received: via spool by 74878-submit <at> debbugs.gnu.org id=B74878.17349755613240
(code B ref 74878); Mon, 23 Dec 2024 17:40:02 +0000
Received: (at 74878) by debbugs.gnu.org; 23 Dec 2024 17:39:21 +0000
Received: from localhost ([127.0.0.1]:55969 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tPmOm-0000qC-Q1
for submit <at> debbugs.gnu.org; Mon, 23 Dec 2024 12:39:21 -0500
Received: from eggs.gnu.org ([209.51.188.92]:39384)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ludo@HIDDEN>) id 1tPmOj-0000py-Oc
for 74878 <at> debbugs.gnu.org; Mon, 23 Dec 2024 12:39:19 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
id 1tPmOc-0004Lg-RX; Mon, 23 Dec 2024 12:39:10 -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:References:In-Reply-To:Subject:To:
From; bh=YJ5Vy5dxPq51xQe7Vb/GlsdzOC4+4qsg8UXnfPE/sHo=; b=eble01qqX7iuoPpKnu7O
NVfwEofpTs0rRjH6kVhAZ4YCPbFhmhgjYxiCy6WL/rK3nS1wIzrvSClA8XPNbl0S555r87lOWa7Gt
h1QENpuyw2koOxCt5Zx/uNgQO1ZeYUlbhR9yTOqoDiwKj+Ga/N/jv8iTz89+5hmKaHH0nZIXnAUSU
o9ArNfKaVFbST366BF65BatLg2vsbm7l66In4P9T+S61SUwtI6Od+x4kyd6Lc5c9TAeIx7xawO/47
EJ+sIykM0K4dFo0cX+Wd2i7NjYmionofL3BDZrPAg2fUowtClmF7cUTDlnvS3HkxAqJz0yIyNNatm
WGjqHsgOohsgRQ==;
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
In-Reply-To: <abc5d45c178b0a00f778af8bc4847c34ed3c70fd.1734221404.git.richard@HIDDEN>
(Richard Sent's message of "Sat, 14 Dec 2024 19:26:47 -0500")
References: <cover.1734221404.git.richard@HIDDEN>
<abc5d45c178b0a00f778af8bc4847c34ed3c70fd.1734221404.git.richard@HIDDEN>
Date: Mon, 23 Dec 2024 18:39:07 +0100
Message-ID: <87msgm8fk4.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Hi,
Richard Sent <richard@HIDDEN> skribis:
> Clarify that arguments are read from standard input and that --query expe=
cts a
> command.
>
> * guix/scripts/substitute.scm (show-help): Reword.
>
> Change-Id: Ifc197d5e10e43663f1e05039ce29086f6a21b943
[...]
> (define (show-help)
> (display (G_ "Usage: guix substitute OPTION [ARGUMENT]...
> -Internal tool to substitute a pre-built binary to a local build.\n"))
> +Internal tool to substitute a pre-built binary to a local build.
> +
> +ARGUMENT is read from standard input, not from the command line.\n"))
I find this sentence confusing since the usage line above shows that
it=E2=80=99s a command-line argument. But since there=E2=80=99s no such ar=
gument, we
can just remove =E2=80=9C[ARGUMENT]...=E2=80=9D from the usage line.
> (display (G_ "
> - --query report on the availability of substitutes for t=
he
> - store file names passed on the standard input"))
> + --query COMMAND STORE-FILE ...
> + Run query COMMAND with STORE-FILE to report on
> + the availability of substitutes"))
I think this also adds to the confusion since =E2=80=98--query=E2=80=99 doe=
sn=E2=80=99t actually
take any arguments.
Note that the protocol =E2=80=98guix-daemon=E2=80=99 and =E2=80=98guix subs=
titute=E2=80=99 is
purposefully undocumented: it=E2=80=99s an implementation detail and users =
are
not supposed to use =E2=80=98guix substitute=E2=80=99 directly.
Thoughts?
Ludo=E2=80=99.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.