From 03fec5263611a95d3cd3c79e91bc3bb7b92c0990 Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Sat, 29 Apr 2017 00:00:48 -0500 Subject: [PATCH] osc-staging: cleanup command and argument number checking. --- osc-staging.py | 55 +++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a/osc-staging.py b/osc-staging.py index 6aee63ed..235c0800 100644 --- a/osc-staging.py +++ b/osc-staging.py @@ -291,38 +291,33 @@ def do_staging(self, subcmd, opts, *args): if len(args) == 0: raise oscerr.WrongArgs('No command given, see "osc help staging"!') 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 - elif cmd == 'repair': - min_args, max_args = 0, None - elif cmd == 'frozenage': - min_args, max_args = 0, None - elif cmd == 'setprio': - min_args, max_args = 0, None - 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'): + elif cmd in ( + 'acheck', + 'cleanup_rings', + 'list', + 'lock', + 'unlock', + ): 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: raise oscerr.WrongArgs('Unknown command: %s' % cmd) if len(args) - 1 < min_args: