From f03a059814ab757a112ea4504ffe8b933a905e3d Mon Sep 17 00:00:00 2001 From: Giampaolo Lauria Date: Mon, 18 Jul 2011 15:45:39 -0400 Subject: [PATCH] samba-tool: Improved --help functionality Added a new --help msg Return an error when no subcommand is specified Signed-off-by: Andrew Tridgell --- source4/scripting/python/samba/netcmd/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/source4/scripting/python/samba/netcmd/__init__.py index 2d345df7b9d..05ed321ef99 100644 --- a/source4/scripting/python/samba/netcmd/__init__.py +++ b/source4/scripting/python/samba/netcmd/__init__.py @@ -3,7 +3,7 @@ # Unix SMB/CIFS implementation. # Copyright (C) Jelmer Vernooij 2009 # Copyright (C) Theresa Halloran 2011 -# Copyright Giampaolo Lauria 2011 +# Copyright (C) Giampaolo Lauria 2011 # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -158,7 +158,11 @@ class SuperCommand(Command): print "Available subcommands:" for cmd in self.subcommands: print "\t%-20s - %s" % (cmd, self.subcommands[cmd].description) - if subcommand in [None, 'help', '-h', '--help' ]: + if subcommand in [None]: + self.show_command_error("You must specify a subcommand") + return -1 + if subcommand in ['-h', '--help']: + print "For more help on a specific subcommand, please type: samba-tool %s (-h|--help)" % myname return 0 self.show_command_error("No such subcommand '%s'" % (subcommand)) -- 2.34.1