From: Osier Yang <jyang@redhat.com>
Date: Fri, 3 Dec 2010 07:34:23 +0000 (+0800)
Subject: virsh: Remove redundant optional option for cmdHelp
X-Git-Tag: v0.8.7~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2636f508426b12a8baebb4e7f3b88245ac9e2e2d;p=thirdparty%2Flibvirt.git

virsh: Remove redundant optional option for cmdHelp

Remove the optional option "group", as cmdHelp should accepts
only one option ("virsh help" supports both command and command
group now, and user rarely uses the options, so it doesn't matter
much for it being longer, :-)

* tools/virsh.c
---

diff --git a/tools/virsh.c b/tools/virsh.c
index 31de80f94f..3e1bde1a90 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -569,8 +569,7 @@ static const vshCmdInfo info_help[] = {
 };
 
 static const vshCmdOptDef opts_help[] = {
-    {"command", VSH_OT_DATA, 0, N_("Prints global help or command specific help.")},
-    {"group", VSH_OT_DATA, 0, N_("Prints global help or help for a group of related commands.")},
+    {"command", VSH_OT_DATA, 0, N_("Prints global help, command specific help, or help for a group of related commands")},
     {NULL, 0, 0, NULL}
 };
 
@@ -583,9 +582,6 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd)
 
     name = vshCommandOptString(cmd, "command", NULL);
 
-    if (!name)
-        name = vshCommandOptString(cmd, "group", NULL);
-
     if (!name) {
         const vshCmdGrp *grp;
         const vshCmdDef *def;