]> xenbits.xensource.com Git - libvirt.git/commitdiff
virsh: trim aliases from -h output
authorEric Blake <eblake@redhat.com>
Fri, 16 Mar 2012 19:23:00 +0000 (13:23 -0600)
committerEric Blake <eblake@redhat.com>
Sat, 17 Mar 2012 04:37:05 +0000 (22:37 -0600)
Commit af3f9aab taught 'virsh help' to ignore command aliases,
but forgot 'virsh -h'.

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

tools/virsh.c

index 19f9bbe3939ba9bf9b464d4a49b288c256e99135..9e5c9b2e576a3943d1b775411f3dcaef4a6c9988 100644 (file)
@@ -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");
     }