mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-02 17:56:15 +01:00
Code

- handle timeout situation in "results -w" call

Browse Source
This commit is contained in:
Adrian Schröter 2012-01-23 18:18:51 +01:00
parent 49d91c373d
commit da85dcd669
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osc/core.py
View File

@ -4703,8 +4703,17 @@ def get_results(apiurl, prj, package, lastbuild=None, repository=[], arch=[], ve
while True: while True:
waiting = False waiting = False
r = [] results = r = []
for res in get_package_results(apiurl, prj, package, lastbuild, repository, arch, oldstate): try:
results = get_package_results(apiurl, prj, package, lastbuild, repository, arch, oldstate)
except urllib2.HTTPError, e:
# check for simple timeout error and fetch again
if e.code != 502:
raise
# re-try result request
continue
for res in results:
if res.has_key('_oldstate'): if res.has_key('_oldstate'):
oldstate = res['_oldstate'] oldstate = res['_oldstate']
continue continue
@ -4722,7 +4731,7 @@ def get_results(apiurl, prj, package, lastbuild=None, repository=[], arch=[], ve
res['status'] = 'outdated (was: %s)' % res['status'] res['status'] = 'outdated (was: %s)' % res['status']
else: else:
res['status'] += '*' res['status'] += '*'
if res['status'] in ('scheduled', 'finished', 'building', 'signing', 'dispatching'): if res['status'] in ('blocked', 'scheduled', 'dispatching', 'building', 'signing', 'finished'):
waiting=True waiting=True
r.append(result_line_templ % res) r.append(result_line_templ % res)