Fix again #2388.
This commit is contained in:
parent
d43e20a6d4
commit
cf49dfce3d
@ -400,23 +400,32 @@ def old_md5(apiurl, src_project, tgt_project, src_package, rev):
|
|||||||
repositories = get_project_repos(apiurl, src_project, tgt_project,
|
repositories = get_project_repos(apiurl, src_project, tgt_project,
|
||||||
src_package, rev)
|
src_package, rev)
|
||||||
|
|
||||||
md5_set = set()
|
srcmd5_list = []
|
||||||
for repository, archs in repositories:
|
for repository, archs in repositories:
|
||||||
for arch, status in archs:
|
for arch, status in archs:
|
||||||
if md5_set:
|
if srcmd5_list:
|
||||||
break
|
break
|
||||||
if status not in ('succeeded', 'outdated'):
|
if status not in ('succeeded', 'outdated'):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
url = makeurl(apiurl, ['build', src_project, repository, arch, '_jobhistory'],
|
url = makeurl(apiurl, ['build', src_project, repository, arch, '_jobhistory'],
|
||||||
query=query)
|
query=query)
|
||||||
print url
|
|
||||||
try:
|
try:
|
||||||
root = ET.parse(http_GET(url)).getroot()
|
root = ET.parse(http_GET(url)).getroot()
|
||||||
md5_set = set(e.get('srcmd5') for e in root.findall('jobhist'))
|
srcmd5_list = [e.get('srcmd5') for e in root.findall('jobhist')]
|
||||||
except urllib2.HTTPError, e:
|
except urllib2.HTTPError, e:
|
||||||
print('ERROR in URL %s [%s]' % (url, e))
|
print('ERROR in URL %s [%s]' % (url, e))
|
||||||
|
|
||||||
|
md5_set = set()
|
||||||
|
for srcmd5 in srcmd5_list:
|
||||||
|
query = {
|
||||||
|
'expand': 1,
|
||||||
|
'rev': srcmd5,
|
||||||
|
}
|
||||||
|
url = makeurl(apiurl, ['source', src_project, src_package], query=query)
|
||||||
|
root = ET.parse(http_GET(url)).getroot()
|
||||||
|
md5_set.add(root.find('linkinfo').get('srcmd5'))
|
||||||
|
|
||||||
return md5_set
|
return md5_set
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user