From patchwork Wed Dec 2 09:21:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 25540 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 CF69C27BBFA; Wed, 2 Dec 2020 10:34:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 73C5627BBF9 for ; Wed, 2 Dec 2020 10:34:33 +0000 (GMT) Received: from localhost ([::1]:45854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkPSy-0000pj-E5 for patchwork@mira.cbaines.net; Wed, 02 Dec 2020 05:34:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkOLm-0002cU-7X for guix-patches@gnu.org; Wed, 02 Dec 2020 04:23:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50902) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kkOLl-0002Xa-Vj for guix-patches@gnu.org; Wed, 02 Dec 2020 04:23:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kkOLl-0007bp-Rr for guix-patches@gnu.org; Wed, 02 Dec 2020 04:23:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45004] [PATCH shepherd] herd: Suggest alternatives when action and service are likely swapped. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Dec 2020 09:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45004 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45004@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160690093929184 (code B ref -1); Wed, 02 Dec 2020 09:23:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Dec 2020 09:22:19 +0000 Received: from localhost ([127.0.0.1]:34215 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkOL5-0007ad-Gn for submit@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 ) id 1kkOL1-0007aR-I0 for submit@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 ) id 1kkOKy-0001Cs-HS for guix-patches@gnu.org; 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 ) id 1kkOKv-0002HW-QG for guix-patches@gnu.org; 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 ; 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 Date: Wed, 2 Dec 2020 10:21:07 +0100 Message-Id: <20201202092106.22770-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 Received-SPF: pass client-ip=129.27.2.202; envelope-from=leo.prikler@student.tugraz.at; 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-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" X-getmail-retrieved-from-mailbox: Patches * 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,