Subject: Re: bug#33673: PATCH: Fwd: Re: bug#33673: "guix system --help" does not detail how to use --on-error=strategy
From: Ludovic Courtès <[email-masked]>
To: swedebugia <[email-masked]>
Cc: [email-masked]
Date: Tue, 18 Dec 2018 11:54:22 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Hello,

swedebugia <[email-masked]> skribis:

> From e71273a1b3b20bba8f4174ac4b98925bbc36ac0d Mon Sep 17 00:00:00 2001
> From: swedebugia <[email-masked]>
> 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=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.
>  
> +@cindex on-error
> +@cindex on-error strategy
> +@cindex error strategy
>  @item --on-error=@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=STRATEGY
> -                         apply STRATEGY when an error occurs while reading FILE"))
> +                         apply STRATEGY (one of: nothing-special, backtrace, debug) when an error occurs while reading FILE."))

I wrapped this line and applied it.

Thank you!

Ludo’.