From mboxrd@z Thu Jan 1 00:00:00 1970 From: swedebugia Subject: bug#33673: PATCH: Fwd: Re: bug#33673: "guix system --help" does not detail how to use --on-error=strategy Date: Fri, 14 Dec 2018 19:52:59 +0100 Message-ID: <502fd617-38d4-c9e4-ad9c-ff237316d46e@riseup.net> References: <87lg4wyopd.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------0F53DC583EFF1418D0AFFD8C" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33080) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXsb9-0006WT-7R for bug-guix@gnu.org; Fri, 14 Dec 2018 13:54:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXsb4-0007GM-Oj for bug-guix@gnu.org; Fri, 14 Dec 2018 13:54:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:44295) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gXsb4-0007GG-JW for bug-guix@gnu.org; Fri, 14 Dec 2018 13:54:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gXsb4-0006nc-Hq for bug-guix@gnu.org; Fri, 14 Dec 2018 13:54:02 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <87lg4wyopd.fsf@gnu.org> Content-Language: en-US List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: guix-patches@gnu.org This is a multi-part message in MIME format. --------------0F53DC583EFF1418D0AFFD8C Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Is this patch ok? -------- Forwarded Message -------- Subject: Re: bug#33673: "guix system --help" does not detail how to use=20 --on-error=3Dstrategy Date: Tue, 11 Dec 2018 18:10:06 +0100 From: Ludovic Court=C3=A8s To: Efraim Flashner CC: swedebugia@riseup.net, 33673@debbugs.gnu.org Hi! Efraim Flashner skribis: > On Sun, Dec 09, 2018 at 12:16:47AM +0100, Ludovic Court=C3=A8s wrote: [...] >> Improvements are always welcome of course. The main criterion would b= e >> to remain consistent with the rest of Guix and with GNU conventions th= at >> we follow. Maybe it=E2=80=99s best to discuss what you have in mind f= irst? >>=20 >> Thank you, >> Ludo=E2=80=99. >>=20 > > I'd go with (one of: nothing-special, backtrace, debug) > with the assumption that for more information the manual is more > verbose. Sounds good to me. Would you like to send a patch? > I also just noticed that we have 'man guix-system', which could be more > verbose on the subject without needing to fit in a concise output. Manual pages are generated from the =E2=80=98--help=E2=80=99 output, the = canonical documentation being the Info manual. Thanks, Ludo=E2=80=99. --------------0F53DC583EFF1418D0AFFD8C Content-Type: text/x-patch; name="0001-system-Clarify-the-three-strategies-available.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-system-Clarify-the-three-strategies-available.patch" >From e71273a1b3b20bba8f4174ac4b98925bbc36ac0d Mon Sep 17 00:00:00 2001 From: swedebugia 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.")) (display (G_ " --file-system-type=TYPE for 'disk-image', produce a root file system of TYPE -- 2.18.0 --------------0F53DC583EFF1418D0AFFD8C--