On 12/03/2010 12:34 AM, Osier Yang wrote:
Remove the optional option "group", as cmdHelp should
accepts
only one option, and rename option "command" as "command-or-group",
("virsh help" supports both command and command group now, and user
nealy uses the options, so it doesn't matter much for it being longer,
:-)
* tools/virsh.c
---
tools/virsh.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
Given the ensuing discussion, I'm pushing with this squashed in.
diff --git i/tools/virsh.c w/tools/virsh.c
index c2d717f..3e1bde1 100644
--- i/tools/virsh.c
+++ w/tools/virsh.c
@@ -569,7 +569,7 @@ static const vshCmdInfo info_help[] = {
};
static const vshCmdOptDef opts_help[] = {
- {"command-or-group", VSH_OT_DATA, 0, N_("Prints global help,
command specific 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}
};
@@ -580,7 +580,7 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd)
const vshCmdGrp *g;
const char *name;
- name = vshCommandOptString(cmd, "command-or-group", NULL);
+ name = vshCommandOptString(cmd, "command", NULL);
if (!name) {
const vshCmdGrp *grp;
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library
http://libvirt.org