tom/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

catch keyboard interrupt for all subcommands

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-09-13 17:42:43 +02:00
parent 5cbe34ee33
commit df7f27f94b
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
bin/cdist
View file

@ -603,10 +603,10 @@ def banner(*args):
print(BANNER) print(BANNER)
sys.exit(0) sys.exit(0)
def config(*args, **kargs): def config(*args):
"""Configure remote system""" """Configure remote system"""
print(*args)
process = {} process = {}
try:
if len(args.host) == 0: if len(args.host) == 0:
parser.print_help() parser.print_help()
sys.exit(1) sys.exit(1)
@ -632,8 +632,6 @@ def config(*args, **kargs):
log.info("Total processing time for %s host(s): %s", len(args.host), log.info("Total processing time for %s host(s): %s", len(args.host),
(time_end - time_start).total_seconds()) (time_end - time_start).total_seconds())
except KeyboardInterrupt:
sys.exit(0)
if __name__ == "__main__": if __name__ == "__main__":
# Construct parser others can reuse # Construct parser others can reuse
@ -652,10 +650,7 @@ if __name__ == "__main__":
parser['main'] = argparse.ArgumentParser(description='cdist ' + VERSION) parser['main'] = argparse.ArgumentParser(description='cdist ' + VERSION)
parser['sub'] = parser['main'].add_subparsers() parser['sub'] = parser['main'].add_subparsers()
parser['banner'] = parser['sub'].add_parser('banner') parser['banner'] = parser['sub'].add_parser('banner')
# parser['banner'].add_argument('all', nargs='*',
# help='Show cdist banner')
parser['banner'].set_defaults(func=banner) parser['banner'].set_defaults(func=banner)
parser['config'] = parser['sub'].add_parser('config', parser['config'] = parser['sub'].add_parser('config',
@ -677,7 +672,6 @@ if __name__ == "__main__":
action='store_false', dest='parallel') action='store_false', dest='parallel')
parser['config'].set_defaults(func=config) parser['config'].set_defaults(func=config)
args = parser['main'].parse_args(sys.argv[1:]) args = parser['main'].parse_args(sys.argv[1:])
# Most subcommands to have --debug, so handle it here # Most subcommands to have --debug, so handle it here
@ -686,4 +680,7 @@ if __name__ == "__main__":
logging.root.setLevel(logging.DEBUG) logging.root.setLevel(logging.DEBUG)
log.debug(args) log.debug(args)
args.func(args) try:
args.func(args)
except KeyboardInterrupt:
sys.exit(0)