From patchwork Wed Nov 15 23:13:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wilko Meyer X-Patchwork-Id: 56505 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 BA61627BBE9; Wed, 15 Nov 2023 23:14:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DE3AA27BBE2 for ; Wed, 15 Nov 2023 23:14:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3P5B-0005rw-S9; Wed, 15 Nov 2023 18:14:05 -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 ) id 1r3P5A-0005pi-Ox for guix-patches@gnu.org; Wed, 15 Nov 2023 18:14:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r3P5A-0001mx-Gi for guix-patches@gnu.org; Wed, 15 Nov 2023 18:14:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3P57-0001wC-LX for guix-patches@gnu.org; Wed, 15 Nov 2023 18:14:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67215] [PATCH 1/1] scripts: Reword --verbosity and --debug help information. Resent-From: Wilko Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Nov 2023 23:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67215 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67215@debbugs.gnu.org Cc: Wilko Meyer Received: via spool by 67215-submit@debbugs.gnu.org id=B67215.17000900367425 (code B ref 67215); Wed, 15 Nov 2023 23:14:01 +0000 Received: (at 67215) by debbugs.gnu.org; 15 Nov 2023 23:13:56 +0000 Received: from localhost ([127.0.0.1]:54137 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3P50-0001vg-OP for submit@debbugs.gnu.org; Wed, 15 Nov 2023 18:13:55 -0500 Received: from mail.wmeyer.eu ([95.216.196.112]:56110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3P4x-0001vQ-GZ for 67215@debbugs.gnu.org; Wed, 15 Nov 2023 18:13:53 -0500 From: Wilko Meyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wmeyer.eu; s=mail; t=1700090025; bh=URSus3TjOlj/l7SqsGCPaU8J/CftJy2qKQ/WE5Ve+MA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WN1bg2KMOH6tUWW0kG7JjdiypQ/rWk0pcrBNzCy4tirPd3Jt3t8GsmN/CF8J8X4bc Vo035BdxAm8mWBLtihfgGK5k+4BBLZzFnmlHmpblg6mv9PTUVgM8Vm/+h7GzE2qIj/ F4EpqkD9mjfZ99ZP1AoXkmxBwrniAEV3JKxFoRPs= Date: Thu, 16 Nov 2023 00:13:16 +0100 Message-ID: In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/scripts/build.scm (show-help): Reword --verbosity and --debug. * guix/scripts/archive.scm (show-help): Reword --verbosity. * guix/scripts/copy.scm (show-help): Reword --verbosity. * guix/scripts/deploy.scm (show-help): Reword --verbosity. * guix/scripts/environment.scm (show-help): Reword --verbosity. * guix/scripts/home.scm (show-help): Reword --verbosity. * guix/scripts/install.scm (show-help): Reword --verbosity. * guix/scripts/pack.scm (show-help): Reword --verbosity. * guix/scripts/package.scm (show-help): Reword --verbosity. * guix/scripts/pull.scm (show-help): Reword --verbosity. * guix/scripts/remove.scm (show-help): Reword --verbosity. * guix/scripts/system.scm (show-help): Reword --verbosity. * guix/scripts/upgrade.scm (show-help): Reword --verbosity. Change-Id: Ie3e23443f55e076d8e4a7a23f70e2f47486e9c61 --- guix/scripts/archive.scm | 4 +++- guix/scripts/build.scm | 7 +++++-- guix/scripts/copy.scm | 4 +++- guix/scripts/deploy.scm | 4 +++- guix/scripts/environment.scm | 4 +++- guix/scripts/home.scm | 4 +++- guix/scripts/install.scm | 4 +++- guix/scripts/pack.scm | 4 +++- guix/scripts/package.scm | 4 +++- guix/scripts/pull.scm | 4 +++- guix/scripts/remove.scm | 4 +++- guix/scripts/system.scm | 4 +++- guix/scripts/upgrade.scm | 4 +++- 13 files changed, 41 insertions(+), 14 deletions(-) diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm index 2b5a55a23f4..480c13904fd 100644 --- a/guix/scripts/archive.scm +++ b/guix/scripts/archive.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2023 Wilko Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -91,7 +92,8 @@ (define (show-help) (display (G_ " -S, --source build the packages' source derivations")) (display (G_ " - -v, --verbosity=LEVEL use the given verbosity LEVEL")) + -v, --verbosity=LEVEL use the given verbosity LEVEL, value must be either 0 (no output), + 1 (quiet), 2 (quiet + download URLs) or 3 (build log on STDERR)")) (newline) (show-build-options-help) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 05f022a92e2..366e782470f 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Mark H Weaver ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2023 Wilko Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -184,7 +185,8 @@ (define (show-build-options-help) (display (G_ " -M, --max-jobs=N allow at most N build jobs")) (display (G_ " - --debug=LEVEL produce debugging output at LEVEL"))) + --debug=LEVEL produce debugging output at LEVEL, value must be an integer + between 0 (more terse) and 5 (more verbose)"))) (define (show-cross-build-options-help) (display (G_ " @@ -452,7 +454,8 @@ (define (show-help) -r, --root=FILE make FILE a symlink to the result, and register it as a garbage collector root")) (display (G_ " - -v, --verbosity=LEVEL use the given verbosity LEVEL")) + -v, --verbosity=LEVEL use the given verbosity LEVEL, value must be either 0 (no output), + 1 (quiet), 2 (quiet + download URLs) or 3 (build log on STDERR)")) (display (G_ " -q, --quiet do not show the build log")) (display (G_ " diff --git a/guix/scripts/copy.scm b/guix/scripts/copy.scm index 67975ac1a9b..ed64d04abb8 100644 --- a/guix/scripts/copy.scm +++ b/guix/scripts/copy.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2023 Wilko Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -120,7 +121,8 @@ (define (show-help) (display (G_ " --from=HOST receive ITEMS from HOST")) (display (G_ " - -v, --verbosity=LEVEL use the given verbosity LEVEL")) + -v, --verbosity=LEVEL use the given verbosity LEVEL, value must be either 0 (no output), + 1 (quiet), 2 (quiet + download URLs) or 3 (build log on STDERR)")) (newline) (show-build-options-help) (newline) diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index 4b1a6030497..350cc1d3395 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2019 David Thompson ;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2020-2022 Ludovic Courtès +;;; Copyright © 2023 Wilko Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,7 +63,8 @@ (define (show-help) -x, --execute execute the following command on all the machines")) (newline) (display (G_ " - -v, --verbosity=LEVEL use the given verbosity LEVEL")) + -v, --verbosity=LEVEL use the given verbosity LEVEL, value must be either 0 (no output), + 1 (quiet), 2 (quiet + download URLs) or 3 (build log on STDERR)")) (show-bug-report-information)) (define %options diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index 6ae3b11e393..3fce43ad25c 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015-2023 Ludovic Courtès ;;; Copyright © 2018 Mike Gerwitz ;;; Copyright © 2022, 2023 John Kehayias +;;; Copyright © 2023 Wilko Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -131,7 +132,8 @@ (define (show-environment-options-help) -S, --symlink=SPEC for containers, add symlinks to the profile according to SPEC, e.g. \"/usr/bin/env=bin/env\".")) (display (G_ " - -v, --verbosity=LEVEL use the given verbosity LEVEL")) + -v, --verbosity=LEVEL use the given verbosity LEVEL, value must be either 0 (no output), + 1 (quiet), 2 (quiet + download URLs) or 3 (build log on STDERR)")) (display (G_ " --bootstrap use bootstrap binaries to build the environment"))) diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm index b4c82d275f1..3abd0fcbc5d 100644 --- a/guix/scripts/home.scm +++ b/guix/scripts/home.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2022-2023 Ludovic Courtès ;;; Copyright © 2022 Arun Isaac ;;; Copyright © 2022 Antero Mejr +;;; Copyright © 2023 Wilko Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -137,7 +138,8 @@ (define (show-help) according to SPEC")) (newline) (display (G_ " - -v, --verbosity=LEVEL use the given verbosity LEVEL")) + -v, --verbosity=LEVEL use the given verbosity LEVEL, value must be either 0 (no output), + 1 (quiet), 2 (quiet + download URLs) or 3 (build log on STDERR)")) (display (G_ " --graph-backend=BACKEND use BACKEND for 'extension-graph' and 'shepherd-graph'")) diff --git a/guix/scripts/install.scm b/guix/scripts/install.scm index 504dbc9a6f6..a1036c16a66 100644 --- a/guix/scripts/install.scm +++ b/guix/scripts/install.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 Ludovic Courtès +;;; Copyright © 2023 Wilko Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,7 +36,8 @@ (define (show-help) -p, --profile=PROFILE use PROFILE instead of the user's default profile")) ;; '--bootstrap' not shown here. (display (G_ " - -v, --verbosity=LEVEL use the given verbosity LEVEL")) + -v, --verbosity=LEVEL use the given verbosity LEVEL, value must be either 0 (no output), + 1 (quiet), 2 (quiet + download URLs) or 3 (build log on STDERR)")) (newline) (show-build-options-help) (newline) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index bdbea49910c..eac3c422730 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2020 Eric Bavier ;;; Copyright © 2022 Alex Griffin +;;; Copyright © 2023 Wilko Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -1493,7 +1494,8 @@ (define (show-help) (display (G_ " -d, --derivation return the derivation of the pack")) (display (G_ " - -v, --verbosity=LEVEL use the given verbosity LEVEL")) + -v, --verbosity=LEVEL use the given verbosity LEVEL, value must be either 0 (no output), + 1 (quiet), 2 (quiet + download URLs) or 3 (build log on STDERR)")) (display (G_ " --bootstrap use the bootstrap binaries to build the pack")) (newline) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index a489e06e731..dc394d0738c 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2022 Josselin Poiret ;;; Copyright © 2022 Arun Isaac ;;; Copyright © 2022 Antero Mejr +;;; Copyright © 2023 Wilko Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -476,7 +477,8 @@ (define (show-help) (display (G_ " --bootstrap use the bootstrap Guile to build the profile")) (display (G_ " - -v, --verbosity=LEVEL use the given verbosity LEVEL")) + -v, --verbosity=LEVEL use the given verbosity LEVEL, value must be either 0 (no output), + 1 (quiet), 2 (quiet + download URLs) or 3 (build log on STDERR)")) (newline) (display (G_ " -s, --search=REGEXP search in synopsis and description using REGEXP")) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 58d3cd7e83c..77e6ebd96a1 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013-2015, 2017-2023 Ludovic Courtès ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice +;;; Copyright © 2023 Wilko Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -116,7 +117,8 @@ (define (show-help) (display (G_ " -p, --profile=PROFILE use PROFILE instead of ~/.config/guix/current")) (display (G_ " - -v, --verbosity=LEVEL use the given verbosity LEVEL")) + -v, --verbosity=LEVEL use the given verbosity LEVEL, value must be either 0 (no output), + 1 (quiet), 2 (quiet + download URLs) or 3 (build log on STDERR)")) (display (G_ " --bootstrap use the bootstrap Guile to build the new Guix")) (newline) diff --git a/guix/scripts/remove.scm b/guix/scripts/remove.scm index be073878c58..f5a5c3dc539 100644 --- a/guix/scripts/remove.scm +++ b/guix/scripts/remove.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 Ludovic Courtès +;;; Copyright © 2023 Wilko Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,7 +35,8 @@ (define (show-help) -p, --profile=PROFILE use PROFILE instead of the user's default profile")) ;; '--bootstrap' not shown here. (display (G_ " - -v, --verbosity=LEVEL use the given verbosity LEVEL")) + -v, --verbosity=LEVEL use the given verbosity LEVEL, value must be either 0 (no output), + 1 (quiet), 2 (quiet + download URLs) or 3 (build log on STDERR)")) (newline) (show-build-options-help) (newline) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index f85b663d643..562a3abb166 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2022 Tobias Geerinckx-Rice +;;; Copyright © 2023 Wilko Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -1038,7 +1039,8 @@ (define (show-help) (display (G_ " --skip-checks skip file system and initrd module safety checks")) (display (G_ " - -v, --verbosity=LEVEL use the given verbosity LEVEL")) + -v, --verbosity=LEVEL use the given verbosity LEVEL, value must be either 0 (no output), + 1 (quiet), 2 (quiet + download URLs) or 3 (build log on STDERR)")) (newline) (display (G_ " --graph-backend=BACKEND diff --git a/guix/scripts/upgrade.scm b/guix/scripts/upgrade.scm index 1a5e8088cb1..483b5c12163 100644 --- a/guix/scripts/upgrade.scm +++ b/guix/scripts/upgrade.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2019, 2020 Ludovic Courtès ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Simon Tournier +;;; Copyright © 2023 Wilko Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,7 +38,8 @@ (define (show-help) (display (G_ " -p, --profile=PROFILE use PROFILE instead of the user's default profile")) (display (G_ " - -v, --verbosity=LEVEL use the given verbosity LEVEL")) + -v, --verbosity=LEVEL use the given verbosity LEVEL, value must be either 0 (no output), + 1 (quiet), 2 (quiet + download URLs) or 3 (build log on STDERR)")) (display (G_ " --do-not-upgrade[=REGEXP] do not upgrade any packages matching REGEXP")) (newline)