mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-27 23:16:14 +01:00
Code

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

Browse Source 
Stop using the multibuild and locallink query parameters, if the api
does not support them (in get_package_results).
This commit is contained in:
Marcus Huewe 2017-03-09 15:14:31 +01:00
commit 00d38be5c3
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osc/core.py
View File

@ -5570,6 +5570,11 @@ def get_package_results(apiurl, project, package, wait=False, *args, **kwargs):
if e.code == 502 or e.code == 504:
# re-try result request
continue
root = ET.fromstring(e.read())
if e.code == 400 and kwargs.get('multibuild') and re.search('multibuild', getattr(root.find('summary'), 'text', '')):
kwargs['multibuild'] = None
kwargs['locallink'] = None
continue
raise
root = ET.fromstring(xml)
kwargs['oldstate'] = root.get('state')