sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

samba-tool: Display Usage line and list commands alphabetically

Browse Source 
Signed-off-by: Andrew Tridgell <tridge@samba.org>
This commit is contained in:
Amitay Isaacs 2011-07-21 12:15:33 +10:00 committed by Andrew Tridgell
parent 02667cbe26
commit d4c1149e3e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source4/scripting/python/samba/netcmd/__init__.py
View File

@ -157,9 +157,12 @@ class SuperCommand(Command):
def _run(self, myname, subcommand=None, *args):
if subcommand in self.subcommands:
return self.subcommands[subcommand]._run(subcommand, *args)
print "Usage: samba-tool %s <subcommand> [options]" % myname
print "Available subcommands:"
for cmd in self.subcommands:
print "\t%-20s - %s" % (cmd, self.subcommands[cmd].description)
subcmds = self.subcommands.keys()
subcmds.sort()
for cmd in subcmds:
print " %-20s - %s" % (cmd, self.subcommands[cmd].description)
if subcommand in [None]:
self.show_command_error("You must specify a subcommand")
return -1
@ -176,7 +179,7 @@ class SuperCommand(Command):
def usage(self, myname, subcommand=None, *args):
if subcommand is None or not subcommand in self.subcommands:
print "Usage: %s (%s) [options]" % (myname,
print "Usage: samba-tool %s (%s) [options]" % (myname,
" | ".join(self.subcommands.keys()))
else:
return self.subcommands[subcommand].usage(*args)