From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
Subject: bug#33673: PATCH: Fwd: Re: bug#33673: "guix system --help" does not
	detail how to use --on-error=strategy
Date: Tue, 18 Dec 2018 11:54:22 +0100
Message-ID: <87h8fbhzq9.fsf@gnu.org>
References: <87lg4wyopd.fsf@gnu.org>
	<502fd617-38d4-c9e4-ad9c-ff237316d46e@riseup.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41637)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gZDFQ-0001Wg-8S
	for bug-guix@gnu.org; Tue, 18 Dec 2018 06:09:18 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gZD1i-0007Si-Nz
	for bug-guix@gnu.org; Tue, 18 Dec 2018 05:55:08 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:48390)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gZD1i-0007SR-I4
	for bug-guix@gnu.org; Tue, 18 Dec 2018 05:55:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gZD1i-0003LO-FZ
	for bug-guix@gnu.org; Tue, 18 Dec 2018 05:55:02 -0500
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-To: bug-guix@gnu.org
Resent-Message-ID: <handler.33673.D33673.154513047412809.done@debbugs.gnu.org>
In-Reply-To: <502fd617-38d4-c9e4-ad9c-ff237316d46e@riseup.net> (swedebugia's
	message of "Fri, 14 Dec 2018 19:52:59 +0100")
List-Id: Bug reports for GNU Guix <bug-guix.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-guix>,
	<mailto:bug-guix-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-guix/>
List-Post: <mailto:bug-guix@gnu.org>
List-Help: <mailto:bug-guix-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-guix>,
	<mailto:bug-guix-request@gnu.org?subject=subscribe>
Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org
Sender: "bug-Guix" <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
To: swedebugia <swedebugia@riseup.net>
Cc: 33673-done@debbugs.gnu.org

Hello,

swedebugia <swedebugia@riseup.net> skribis:

> From e71273a1b3b20bba8f4174ac4b98925bbc36ac0d Mon Sep 17 00:00:00 2001
> From: swedebugia <swedebugia@riseup.net>
> Date: Fri, 14 Dec 2018 19:41:41 +0100
> Subject: [PATCH] system: Clarify the three strategies available.
>
> * guix/scripts/system.scm (show-help): Clarify the three choices.
> * doc/guix.texi (Invoking guix system): Add 3 @cindex to make on-error=3D=
strategy
>   easier to find.
> ---
>  doc/guix.texi           | 3 +++
>  guix/scripts/system.scm | 2 +-
>  2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/doc/guix.texi b/doc/guix.texi
> index 20b5013fd..4c204c619 100644
> --- a/doc/guix.texi
> +++ b/doc/guix.texi
> @@ -22628,6 +22628,9 @@ appear in the @code{operating-system} declaration=
 actually exist
>  needed at boot time are listed in @code{initrd-modules} (@pxref{Initial
>  RAM Disk}).  Passing this option skips these tests altogether.
>=20=20
> +@cindex on-error
> +@cindex on-error strategy
> +@cindex error strategy
>  @item --on-error=3D@var{strategy}
>  Apply @var{strategy} when an error occurs when reading @var{file}.
>  @var{strategy} may be one of the following:
> diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
> index 8eb32c62b..d94917100 100644
> --- a/guix/scripts/system.scm
> +++ b/guix/scripts/system.scm
> @@ -993,7 +993,7 @@ Some ACTIONS support additional ARGS.\n"))
>                           instead of reading FILE, when applicable"))
>    (display (G_ "
>        --on-error=3DSTRATEGY
> -                         apply STRATEGY when an error occurs while readi=
ng FILE"))
> +                         apply STRATEGY (one of: nothing-special, backtr=
ace, debug) when an error occurs while reading FILE."))

I wrapped this line and applied it.

Thank you!

Ludo=E2=80=99.