yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimize request_id_for_package

Browse Source
This commit is contained in:
Stephan Kulow 2019-11-08 11:45:21 +01:00
parent b91cc995dd
commit 26772ff058
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osclib/request_finder.py
View File

@ -158,17 +158,20 @@ class RequestFinder(object):
This function is only called for its side effect. This function is only called for its side effect.
""" """
url = self.api.makeurl(['staging', self.api.project, 'staging_projects'], { 'requests': 1 })
status = ET.parse(self.api.retried_GET(url)).getroot()
for p in pkgs: for p in pkgs:
found = False found = False
for staging in self.api.get_staging_projects(): for staging in status.findall('staging_project'):
if _is_int(p) and self.api.get_package_for_request_id(staging, p): if _is_int(p) and self.api.get_package_for_request_id(staging.get('name'), p):
self.srs[int(p)] = {'staging': staging} self.srs[int(p)] = {'staging': staging.get('name')}
found = True found = True
break break
else: else:
rq = self.api.get_request_id_for_package(staging, p) for request in staging.findall('staged_requests/request'):
if rq: if request.get('package') == p:
self.srs[rq] = {'staging': staging} self.srs[int(request.get('id'))] = {'staging': staging.get('name')}
found = True found = True
break break
if not found: if not found:

1
osclib/stagingapi.py
View File

@ -647,7 +647,6 @@ class StagingAPI(object):
:param project: project the package is in :param project: project the package is in
:param package: package we want to query for :param package: package we want to query for
""" """
logging.error('get_request_id_for_package')
data = self.project_status(project, status=False) data = self.project_status(project, status=False)
for x in data.findall('staged_requests/request'): for x in data.findall('staged_requests/request'):
if x.get('package') == package: if x.get('package') == package: