Fix _command_list() function for empty command sets
authorCatalin Marinas <catalin.marinas@gmail.com>
Wed, 10 Feb 2010 15:14:27 +0000 (15:14 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 10 Feb 2010 15:14:27 +0000 (15:14 +0000)
The alias commands are not real StGit commands and the corresponding set
(kind) defined in stgit/commands/__init__.py is empty. This leads to a
KeyError in the _command_list() function. The patch ignores empty sets.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
stgit/commands/__init__.py

index f9de42b..bf07c82 100644 (file)
@@ -69,7 +69,10 @@ def _command_list(commands):
         kinds.setdefault(kind, {})[cmd] = help
     for kind in _kind_order:
         kind = _kinds[kind]
-        yield kind, sorted(kinds[kind].iteritems())
+        try:
+            yield kind, sorted(kinds[kind].iteritems())
+        except KeyError:
+            pass
 
 def pretty_command_list(commands, f):
     cmd_len = max(len(cmd) for cmd in commands.iterkeys())