mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 06:46:15 +01:00
Code

Merge branch 'fix_osc_api_without_arguments' of https://github.com/lethliel/osc

Browse Source 
Fix handling of incorrect CLI arguments (python3).
This commit is contained in:
Marcus Huewe 2020-05-18 20:05:25 +02:00
commit 9b2cbfead0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osc/cmdln.py
View File

@ -97,6 +97,9 @@ _NOT_SPECIFIED = ("Not", "Specified")
_INCORRECT_NUM_ARGS_RE = re.compile(
r"(takes [\w ]+ )(\d+)( arguments? \()(\d+)( given\))")
_INCORRECT_NUM_ARGS_RE_PY3 = re.compile(
r"(missing\s+\d+.*)")
# Static bits of man page
MAN_HEADER = r""".TH %(ucname)s "1" "%(date)s" "%(name)s %(version)s" "User Commands"
.SH NAME
@ -1246,6 +1249,7 @@ class Cmdln(RawCmdln):
raise
msg = ex.args[0]
match = _INCORRECT_NUM_ARGS_RE.search(msg)
match_py3 = _INCORRECT_NUM_ARGS_RE_PY3.search(msg)
if match:
msg = list(match.groups())
msg[1] = int(msg[1]) - 3
@ -1254,6 +1258,8 @@ class Cmdln(RawCmdln):
msg[3] = int(msg[3]) - 3
msg = ''.join(map(str, msg))
raise CmdlnUserError(msg)
elif match_py3:
raise CmdlnUserError(match_py3.group(1))
else:
raise
else: