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

Calling ./ipa with no command now calls Command.help()

Browse Source
This commit is contained in:
Jason Gerard DeRose
2008-11-12 10:15:24 -07:00
parent f04aaff97c
commit 01a7f1f437
1 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
ipalib/cli.py
View File

@@ -241,12 +241,16 @@ def exit_error(error):
class help(frontend.Application):
'Display help on a command.'
'''Display help on a command.'''
takes_args = ['command']
takes_args = ['command?']
def run(self, key):
key = str(key)
def run(self, command):
textui = self.Backend.textui
if command is None:
self.print_commands()
return
key = str(command)
if key not in self.application:
print 'help: no such command %r' % key
sys.exit(2)
@@ -254,6 +258,24 @@ class help(frontend.Application):
print 'Purpose: %s' % cmd.doc
self.application.build_parser(cmd).print_help()
def print_commands(self):
std = set(self.Command) - set(self.Application)
print '\nStandard IPA commands:'
for key in sorted(std):
cmd = self.api.Command[key]
self.print_cmd(cmd)
print '\nSpecial CLI commands:'
for cmd in self.api.Application():
self.print_cmd(cmd)
print '\nUse the --help option to see all the global options'
print ''
def print_cmd(self, cmd):
print ' %s %s' % (
to_cli(cmd.name).ljust(self.application.mcl),
cmd.doc,
)
class console(frontend.Application):
"""Start the IPA interactive Python console."""
@@ -406,12 +428,9 @@ class CLI(object):
if self.api.env.mode == 'unit_test':
return
if len(self.cmd_argv) < 1:
self.print_commands()
print 'Usage: ipa [global-options] COMMAND'
sys.exit(2)
sys.exit(self.api.Command.help())
key = self.cmd_argv[0]
if key not in self:
self.print_commands()
print 'ipa: ERROR: unknown command %r' % key
sys.exit(2)
return self.run_cmd(self[key])
@@ -505,23 +524,7 @@ class CLI(object):
)
self.__done.add(name)
def print_commands(self):
std = set(self.api.Command) - set(self.api.Application)
print '\nStandard IPA commands:'
for key in sorted(std):
cmd = self.api.Command[key]
self.print_cmd(cmd)
print '\nSpecial CLI commands:'
for cmd in self.api.Application():
self.print_cmd(cmd)
print '\nUse the --help option to see all the global options'
print ''
def print_cmd(self, cmd):
print ' %s %s' % (
to_cli(cmd.name).ljust(self.mcl),
cmd.doc,
)
def run_cmd(self, cmd):
kw = self.parse(cmd)