osc-staging: cleanup command and argument number checking.

This commit is contained in:
Jimmy Berry 2017-04-29 00:00:48 -05:00
parent b79543849e
commit 03fec52636

View File

@ -291,38 +291,33 @@ def do_staging(self, subcmd, opts, *args):
if len(args) == 0: if len(args) == 0:
raise oscerr.WrongArgs('No command given, see "osc help staging"!') raise oscerr.WrongArgs('No command given, see "osc help staging"!')
cmd = args[0] cmd = args[0]
if cmd == 'freeze': if cmd in (
'accept',
'adi',
'check',
'frozenage',
'unignore',
'select',
'unselect',
'rebuild',
'repair',
'setprio',
'supersede',
):
min_args, max_args = 0, None
elif cmd in (
'freeze',
'ignore',
):
min_args, max_args = 1, None min_args, max_args = 1, None
elif cmd == 'repair': elif cmd in (
min_args, max_args = 0, None 'acheck',
elif cmd == 'frozenage': 'cleanup_rings',
min_args, max_args = 0, None 'list',
elif cmd == 'setprio': 'lock',
min_args, max_args = 0, None 'unlock',
elif cmd == 'check': ):
min_args, max_args = 0, None
elif cmd == 'select':
min_args, max_args = 0, None
elif cmd == 'unselect':
min_args, max_args = 0, None
elif cmd == 'adi':
min_args, max_args = 0, None
elif cmd == 'ignore':
min_args, max_args = 1, None
elif cmd == 'unignore':
min_args, max_args = 0, None
elif cmd == 'accept':
min_args, max_args = 0, None
elif cmd in ('cleanup_rings', 'acheck', 'list'):
min_args, max_args = 0, 0 min_args, max_args = 0, 0
elif cmd == 'lock':
min_args, max_args = 0, 0
elif cmd == 'unlock':
min_args, max_args = 0, 0
elif cmd == 'rebuild':
min_args, max_args = 0, None
elif cmd == 'supersede':
min_args, max_args = 0, None
else: else:
raise oscerr.WrongArgs('Unknown command: %s' % cmd) raise oscerr.WrongArgs('Unknown command: %s' % cmd)
if len(args) - 1 < min_args: if len(args) - 1 < min_args: