From: Eric Blake <eblake@redhat.com>
Date: Fri, 16 Mar 2012 19:23:00 +0000 (-0600)
Subject: virsh: trim aliases from -h output
X-Git-Tag: v0.9.11-rc1~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=787f4fe;p=thirdparty%2Flibvirt.git

virsh: trim aliases from -h output

Commit af3f9aab taught 'virsh help' to ignore command aliases,
but forgot 'virsh -h'.

* tools/virsh.c (vshUsage): Handle aliases.
---

diff --git a/tools/virsh.c b/tools/virsh.c
index 19f9bbe393..9e5c9b2e57 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -19718,12 +19718,15 @@ vshUsage(void)
                       "  commands (non interactive mode):\n\n"), progname, progname);
 
     for (grp = cmdGroups; grp->name; grp++) {
-        fprintf(stdout, _(" %s (help keyword '%s')\n"), grp->name, grp->keyword);
-
-        for (cmd = grp->commands; cmd->name; cmd++)
+        fprintf(stdout, _(" %s (help keyword '%s')\n"),
+                grp->name, grp->keyword);
+        for (cmd = grp->commands; cmd->name; cmd++) {
+            if (cmd->flags & VSH_CMD_FLAG_ALIAS)
+                continue;
             fprintf(stdout,
-                    "    %-30s %s\n", cmd->name, _(vshCmddefGetInfo(cmd, "help")));
-
+                    "    %-30s %s\n", cmd->name,
+                    _(vshCmddefGetInfo(cmd, "help")));
+        }
         fprintf(stdout, "\n");
     }