From 6ac0e9b90f14beba5e5a8857c358a292e218cd49 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Thu, 8 Nov 2012 08:10:54 -0500 Subject: Simplify `ipa help topics` output This brings the output closer to `ipa help commands` and removes extraneous information. Part of the effort for https://fedorahosted.org/freeipa/ticket/3060 --- ipalib/cli.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'ipalib/cli.py') diff --git a/ipalib/cli.py b/ipalib/cli.py index a20c06e85..fc6ac6378 100644 --- a/ipalib/cli.py +++ b/ipalib/cli.py @@ -791,16 +791,9 @@ class help(frontend.Local): def print_topics(self, outfile): writer = self._writer(outfile) - topics = sorted(self._topics.keys()) - - writer(_('Usage: ipa [global-options] COMMAND [command-options]...')) - writer() - writer(_('Help topics:')) - for t in topics: - topic = self._topics[t] - writer(' %s %s' % (to_cli(t).ljust(self._mtl), topic[0])) - writer() - writer(_('Try `ipa --help` for a list of global options.')) + + for t, topic in sorted(self._topics.items()): + writer('%s %s' % (to_cli(t).ljust(self._mtl), topic[0])) def print_commands(self, topic, outfile): writer = self._writer(outfile) -- cgit