[Yum-devel] [PATCH 1/2] if we define multiple command names in getNames() make sure we display them all in the usage

Seth Vidal skvidal at fedoraproject.org
Thu Aug 19 02:21:33 UTC 2010


even if we do get some duplicate summaries
---
 cli.py |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cli.py b/cli.py
index 9542b7a..03fa362 100644
--- a/cli.py
+++ b/cli.py
@@ -139,16 +139,17 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
         names and summary usages.
         """
         usage = 'yum [options] COMMAND\n\nList of Commands:\n\n'
-        commands = yum.misc.unique(self.yum_cli_commands.values())
-        commands.sort(key=lambda x: x.getNames()[0])
-        for command in commands:
+        for name in sorted(self.yum_cli_commands.keys()):
             # XXX Remove this when getSummary is common in plugins
+            command = self.yum_cli_commands[name]
             try:
-                summary = command.getSummary()
-                usage += "%-14s %s\n" % (command.getNames()[0], summary)
+                usage_name = command.getSummary()
+                usage += "%-14s %s\n" % (name, usage_name)
             except (AttributeError, NotImplementedError):
-                usage += "%s\n" % command.getNames()[0]
-
+                try:
+                    usage += "%-14s %s\n" % (name, command.getUsage(cmd=name))
+                except TypeError:
+                    usage += "%s\n" % name
         return usage
     
     def _parseSetOpts(self, setopts):
-- 
1.7.2.1



More information about the Yum-devel mailing list