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

samba-tool: Fix error handling in SuperCommand class

Browse Source 
Created show_command_error method to handle errors in SuperCommand
Removed statement in SuperCommand to raise exception

Signed-off-by: Andrew Tridgell <tridge@samba.org>
This commit is contained in:
Giampaolo Lauria
2011-07-18 11:30:23 -04:00
committed by Andrew Tridgell
parent 8e0a860561
commit 903ec440c4
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ class Option(optparse.Option):
pass
class Command(object):
"""A net command."""
@ -88,7 +89,6 @@ class Command(object):
if force_traceback or samba.get_debug_level() >= 3:
traceback.print_tb(etraceback)
synopsis = property(_get_synopsis)
outf = sys.stdout
@ -146,6 +146,7 @@ class Command(object):
raise NotImplementedError(self.run)
class SuperCommand(Command):
"""A command with subcommands."""
@ -159,7 +160,13 @@ class SuperCommand(Command):
print "\t%-20s - %s" % (cmd, self.subcommands[cmd].description)
if subcommand in [None, 'help', '-h', '--help' ]:
return 0
raise CommandError("No such subcommand '%s'" % subcommand)
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)
return -1
def usage(self, myname, subcommand=None, *args):
if subcommand is None or not subcommand in self.subcommands:
@ -169,6 +176,7 @@ class SuperCommand(Command):
return self.subcommands[subcommand].usage(*args)
class CommandError(Exception):
'''an exception class for netcmd errors'''
def __init__(self, message, inner_exception=None):
@ -177,6 +185,7 @@ class CommandError(Exception):
self.exception_info = sys.exc_info()
commands = {}
from samba.netcmd.newuser import cmd_newuser
commands["newuser"] = cmd_newuser()