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

Some fixes for supersede and unselect

Browse Source 
the API changed to /requests
This commit is contained in:
Stephan Kulow 2019-10-28 16:12:26 +01:00
parent 84fd391e3e
commit 61205d35e3
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osclib/accept_command.py
View File

@ -82,7 +82,7 @@ class AcceptCommand(object):
rf = RequestFinder(self.api)
oldspecs = {}
for req in status.findall('staged_requests/entry'):
for req in status.findall('staged_requests/request'):
packages.append(req.get('package'))
print('Checking file list of {}'.format(req.get('package')))

19
osclib/stagingapi.py
View File

@ -233,7 +233,7 @@ class StagingAPI(object):
status = self.project_status(prj)
if status is None:
continue
for req in status.findall('staged_requests/entry'):
for req in status.findall('staged_requests/request'):
packages_staged[req.get('package')] = {'prj': prj, 'rq_id': req.get('id')}
return packages_staged
@ -591,7 +591,7 @@ class StagingAPI(object):
url = self.makeurl(['staging', self.project, 'excluded_requests'])
root = ET.parse(self.retried_GET(url)).getroot()
for entry in root.findall('request'):
ignore[entry.get('id')] = entry.get('desciption')
ignore[entry.get('id')] = entry.get('description')
return ignore
@memoize(session=True, add_invalidate=True)
@ -619,8 +619,10 @@ class StagingAPI(object):
f = http_GET(url)
root = ET.parse(f).getroot()
ignored_requests = self.get_ignored_requests()
for rq in root.findall('request'):
requests.append(rq)
if not rq.get('id') in ignored_requests:
requests.append(rq)
return requests
def dispatch_open_requests(self, target_requests=None):
@ -636,15 +638,10 @@ class StagingAPI(object):
# get all current pending requests
self._supersede = True
requests = self.get_open_requests()
requests_ignored = self.get_ignored_requests()
# check if we can reduce it down by accepting some
for rq in requests:
request_id = int(rq.get('id'))
if not len(target_requests) and request_id in requests_ignored:
continue
# if self.crings:
# self.accept_non_ring_request(rq)
stage_info, code = self.update_superseded_request(rq, target_requests)
print('STAGING', stage_info, code)
if stage_info:
yield (stage_info, code, rq)
self._supersede = False
@ -685,7 +682,7 @@ class StagingAPI(object):
:param package: package we want to query for
"""
data = self.project_status(project)
for x in data.findall('staged_requests/entry'):
for x in data.findall('staged_requests/request'):
if x.get('package') == package:
return int(x.get('id'))
return None
@ -698,7 +695,7 @@ class StagingAPI(object):
"""
data = self.project_status(project)
request_id = str(request_id)
for x in data.findall('staged_requests/entry'):
for x in data.findall('staged_requests/request'):
if x.get('id') == request_id:
return x.get('package')
return None

3
osclib/unselect_command.py
View File

@ -52,8 +52,7 @@ class UnselectCommand(object):
self.api).items():
staging_project = request_project['staging']
affected_projects.add(staging_project)
msg = 'Unselecting "{}" from "{}"'.format(request, staging_project)
print(msg)
print('Unselecting "{}" from "{}"'.format(request, staging_project))
self.api.rm_from_prj(staging_project, request_id=request, msg='Removing from {}, re-evaluation needed'.format(staging_project))
req = get_request(self.api.apiurl, str(request))