IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in ipa help for NO_CLI plugins.

Browse Source 
Fix #854
This commit is contained in:
Pavel Zuna 2011-02-02 12:47:34 -05:00 committed by Rob Crittenden
parent 275998f6bd
commit dba751758c
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ipalib/cli.py
View File

@ -730,19 +730,6 @@ class help(frontend.Local):
for t in topics: for t in topics:
topic = self._topics[t] topic = self._topics[t]
print ' %s %s' % (to_cli(t).ljust(self._mtl), topic[0]) print ' %s %s' % (to_cli(t).ljust(self._mtl), topic[0])
if False:
topic_commands = self._topics[t][2]
mod_list = [self._get_command_module(c.module) for c in topic_commands]
mod_list = list(set(mod_list))
for mod in mod_list:
m = '%s.%s' % (self._PLUGIN_BASE_MODULE, mod)
if 'topic' in dir(sys.modules[m]):
doc = sys.modules[m].topic[1]
else:
doc = (sys.modules[m].__doc__ or '').strip().split('\n', 1)[0]
print ' %s %s' % (to_cli(t).ljust(self._mtl), doc)
print '' print ''
print 'Try `ipa --help` for a list of global options.' print 'Try `ipa --help` for a list of global options.'
@ -759,6 +746,7 @@ class help(frontend.Local):
mcl = self._topics[topic][1] mcl = self._topics[topic][1]
commands = self._topics[topic][2] commands = self._topics[topic][2]
else: else:
commands = []
for t in self._topics: for t in self._topics:
if type(self._topics[t][2]) is not dict: if type(self._topics[t][2]) is not dict:
continue continue
@ -772,8 +760,8 @@ class help(frontend.Local):
doc = (sys.modules[m].__doc__ or '').strip() doc = (sys.modules[m].__doc__ or '').strip()
print doc print doc
print ''
if len(commands) > 1: if len(commands) > 1:
print ''
print 'Topic commands:' print 'Topic commands:'
for c in commands: for c in commands:
print ' %s %s' % (to_cli(c.name).ljust(mcl), c.summary) print ' %s %s' % (to_cli(c.name).ljust(mcl), c.summary)