GNU bug report logs - #45004
[PATCH shepherd] herd: Suggest alternatives when action and service are likely swapped.

Message received at submit <at> debbugs.gnu.org:

Received: (at submit) by debbugs.gnu.org; 2 Dec 2020 09:22:19 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Dec 02 04:22:19 2020
Received: from localhost ([127.0.0.1]:34215 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kkOL5-0007ad-Gn
	for submit <at> debbugs.gnu.org; Wed, 02 Dec 2020 04:22:19 -0500
Received: from lists.gnu.org ([209.51.188.17]:51782)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <leo.prikler@HIDDEN>) id 1kkOL1-0007aR-I0
 for submit <at> debbugs.gnu.org; Wed, 02 Dec 2020 04:22:18 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:58770)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <leo.prikler@HIDDEN>)
 id 1kkOKy-0001Cs-HS
 for guix-patches@HIDDEN; Wed, 02 Dec 2020 04:22:14 -0500
Received: from mailrelay.tugraz.at ([129.27.2.202]:57210)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <leo.prikler@HIDDEN>)
 id 1kkOKv-0002HW-QG
 for guix-patches@HIDDEN; Wed, 02 Dec 2020 04:22:11 -0500
Received: from localhost.localdomain (217-149-166-73.nat.highway.telekom.at
 [217.149.166.73])
 by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4CmD4r118cz1LBCr
 for <guix-patches@HIDDEN>; Wed,  2 Dec 2020 10:22:04 +0100 (CET)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4CmD4r118cz1LBCr
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at;
 s=mailrelay; t=1606900924;
 bh=bgOCjnCSd4UJ8T+Hwfqb6+57bHH2+HejKBHcAuwzxp4=;
 h=From:To:Subject:Date:From;
 b=IvB2K0nv5Ib48Q10IHlGcLgG7CS4Dve430L3WYwSeZAmx9ESziGYwrMeiaUWZwyYe
 Gx9KOnzYurNvcyOp89CUJ5M+3ILkJnWpEVyhNAC4eH67iKUAo2vGqshHPsR8eQxtse
 0rhybRzYrSx6j9B/y+XaRLc0NeXtbkkLA2OyCbFE=
From: Leo Prikler <leo.prikler@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH shepherd] herd: Suggest alternatives when action and service
 are likely swapped.
Date: Wed,  2 Dec 2020 10:21:07 +0100
Message-Id: <20201202092106.22770-1-leo.prikler@HIDDEN>
X-Mailer: git-send-email 2.29.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw
X-Spam-Scanner: SpamAssassin 3.003001 
X-Spam-Score-relay: -1.9
X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117
Received-SPF: pass client-ip=129.27.2.202;
 envelope-from=leo.prikler@HIDDEN; helo=mailrelay.tugraz.at
X-Spam_score_int: -42
X-Spam_score: -4.3
X-Spam_bar: ----
X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3,
 RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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.3 (-)
X-Debbugs-Envelope-To: submit
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.3 (--)

* modules/shepherd/script/herd.scm (run-command)[reply error]: Report a more
descriptive error if service could reasonably have been an action.
---
 modules/shepherd/scripts/herd.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/shepherd/scripts/herd.scm b/modules/shepherd/scripts/herd.scm
index 106de1e..a178f51 100644
--- a/modules/shepherd/scripts/herd.scm
+++ b/modules/shepherd/scripts/herd.scm
@@ -179,6 +179,15 @@ the daemon via SOCKET-FILE."
                 ('messages messages))
         (for-each display-line messages)
         (report-command-error error)
+        (match (list action service)
+          ((_ (or 'start 'stop 'status 'doc))
+           (report-error (l10n "did you mean 'herd ~a ~a'?")
+                         service action))
+          ((root (or 'help 'halt 'power-off 'load 'eval 'unload 'reload
+                     'daemonize 'persistency 'no-persistency 'cd 'restart))
+           (report-error (l10n "did you mean 'herd ~a ~a'?")
+                         service action))
+          ((_ _) *unspecified*))
         (exit 1))
        ((? eof-object?)
         ;; When stopping shepherd, we may get an EOF in lieu of a real reply,
-- 
2.29.2