From f5e173284a959197ea3ee347fc9625aadb9591dc Mon Sep 17 00:00:00 2001 From: Giampaolo Lauria Date: Thu, 28 Jul 2011 21:44:06 -0400 Subject: samba-tool: Redefined samba-tool as a SuperCommand Removed MainCommand class as samba-tool is a SuperCommand Redefined samba-tool as a SuperCommand Fixed error handling in SuperCommand _run Signed-off-by: Amitay Isaacs Signed-off-by: Andrew Bartlett --- source4/scripting/python/samba/netcmd/__init__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'source4/scripting/python') diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/source4/scripting/python/samba/netcmd/__init__.py index 12e6a99b4d..360134644b 100644 --- a/source4/scripting/python/samba/netcmd/__init__.py +++ b/source4/scripting/python/samba/netcmd/__init__.py @@ -148,7 +148,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 [options]" % myname + + if (myname == "samba-tool"): + usage = "samba-tool " + else: + usage = "samba-tool %s " % myname + print "Usage: %s [options]" %usage print "Available subcommands:" subcmds = self.subcommands.keys() subcmds.sort() @@ -157,7 +162,7 @@ class SuperCommand(Command): if subcommand in [None]: 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 (-h|--help)" % myname + print "For more help on a specific subcommand, please type: %s (-h|--help)" % usage return 0 raise CommandError("No such subcommand '%s'" % subcommand) -- cgit