matthijs/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

consistently support -h, -v, -d in all commands

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-09-28 09:06:20 +02:00
commit e162861b17
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
bin/cdist
View file

@ -39,16 +39,17 @@ def commandline():
# Construct parser others can reuse # Construct parser others can reuse
parser = {} parser = {}
# Options _all_ parsers have in common # Options _all_ parsers have in common
parser['most'] = argparse.ArgumentParser(add_help=False) parser['loglevel'] = argparse.ArgumentParser(add_help=False)
parser['most'].add_argument('-d', '--debug', parser['loglevel'].add_argument('-d', '--debug',
help='Set log level to debug', action='store_true', help='Set log level to debug', action='store_true',
default=False) default=False)
parser['most'].add_argument('-v', '--verbose', parser['loglevel'].add_argument('-v', '--verbose',
help='Set log level to info, is more verbose', help='Set log level to info, be more verbose',
action='store_true', default=False) action='store_true', default=False)
# Main subcommand parser # Main subcommand parser
parser['main'] = argparse.ArgumentParser(description='cdist ' + cdist.VERSION) parser['main'] = argparse.ArgumentParser(description='cdist ' + cdist.VERSION,
parents=[parser['loglevel']])
parser['main'].add_argument('-V', '--version', parser['main'].add_argument('-V', '--version',
help='Show version', action='version', help='Show version', action='version',
version='%(prog)s ' + cdist.VERSION) version='%(prog)s ' + cdist.VERSION)
@ -56,7 +57,7 @@ def commandline():
# Banner # Banner
parser['banner'] = parser['sub'].add_parser('banner', parser['banner'] = parser['sub'].add_parser('banner',
add_help=False) parents=[parser['loglevel']])
parser['banner'].set_defaults(func=cdist.banner.banner) parser['banner'].set_defaults(func=cdist.banner.banner)
# Config and install (common stuff) # Config and install (common stuff)
@ -78,12 +79,12 @@ def commandline():
# Config # Config
parser['config'] = parser['sub'].add_parser('config', parser['config'] = parser['sub'].add_parser('config',
parents=[parser['most'], parser['configinstall']]) parents=[parser['loglevel'], parser['configinstall']])
parser['config'].set_defaults(func=cdist.config.config) parser['config'].set_defaults(func=cdist.config.config)
# Install # Install
parser['install'] = parser['sub'].add_parser('install', parser['install'] = parser['sub'].add_parser('install',
parents=[parser['most'], parser['configinstall']]) parents=[parser['loglevel'], parser['configinstall']])
parser['install'].set_defaults(func=cdist.install.install) parser['install'].set_defaults(func=cdist.install.install)
for p in parser: for p in parser: