sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-14 12:59:07 +03:00
Code Activity

samba-tool: Raise exception on errors and report using base class

Browse Source 
Exceptions are captured at top-level samba-tool and reported using
the base class (Command) method show_command_error().

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

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

@ -164,18 +164,11 @@ class SuperCommand(Command):
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
if subcommand in ['-h', '--help']:
raise CommandError("You must specify a subcommand")
if subcommand in ['help', '-h', '--help']:
print "For more help on a specific subcommand, please type: samba-tool %s <subcommand> (-h|--help)" % myname
return 0
self.show_command_error("No such subcommand '%s'" % (subcommand))
def show_command_error(self, msg):
'''display a command error'''
print >>sys.stderr, "ERROR: %s" % (msg)
sys.exit(1)
raise CommandError("No such subcommand '%s'" % subcommand)
def usage(self, myname, subcommand=None, *args):
if subcommand is None or not subcommand in self.subcommands: