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

Adopt to latest API changes

Browse Source 
we decided to drop the `number` as it's `id` everywhere else
This commit is contained in:
Stephan Kulow 2019-11-21 07:18:53 +01:00
parent eacbffad34
commit 0402f0abb2
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osclib/stagingapi.py
View File

@ -555,14 +555,13 @@ class StagingAPI(object):
def add_ignored_request(self, request_id, comment): def add_ignored_request(self, request_id, comment):
url = self.makeurl(['staging', self.project, 'excluded_requests']) url = self.makeurl(['staging', self.project, 'excluded_requests'])
root = ET.Element('excluded_requests') root = ET.Element('excluded_requests')
req = ET.SubElement(root, 'request', { 'number': str(request_id), 'description': comment }) req = ET.SubElement(root, 'request', { 'id': str(request_id), 'description': comment })
http_POST(url, data=ET.tostring(root)) http_POST(url, data=ET.tostring(root))
def del_ignored_request(self, request_id): def del_ignored_request(self, request_id):
url = self.makeurl(['staging', self.project, 'excluded_requests']) url = self.makeurl(['staging', self.project, 'excluded_requests'])
root = ET.Element('excluded_requests') root = ET.Element('excluded_requests')
req = ET.SubElement(root, 'number') req = ET.SubElement(root, 'request', { 'id': request_id })
req.text = str(request_id)
http_DELETE(url, data=ET.tostring(root)) http_DELETE(url, data=ET.tostring(root))
@memoize(session=True, add_invalidate=True) @memoize(session=True, add_invalidate=True)
@ -672,25 +671,15 @@ class StagingAPI(object):
if self._supersede: if self._supersede:
self.is_package_disabled(project, package, store=True) self.is_package_disabled(project, package, store=True)
# https://github.com/openSUSE/open-build-service/issues/7356
for sub_pkg in self.get_sub_packages(package, project): for sub_pkg in self.get_sub_packages(package, project):
if self._supersede: if self._supersede:
self.is_package_disabled(project, sub_pkg, store=True) self.is_package_disabled(project, sub_pkg, store=True)
try:
delete_package(self.apiurl, project, sub_pkg, force=True, msg=msg)
except HTTPError as e:
# don't make this an hard error
print(e)
# Delete the main package in the last # Deleting the main package removes local links as well
self.delete_requests(self.project, project, [request_id]) self.delete_request(self.project, project, request_id)
# https://github.com/openSUSE/osc/pull/631/files def delete_request(self, project, stage, request):
def delete_requests(self, project, stage, rqids): requestxml = f"<requests><request id='{request}'/></requests>"
requestxml = "<requests>"
for rq in rqids:
requestxml += "<number>%s</number>" % rq
requestxml += "</requests>"
u = makeurl(self.apiurl, ['staging', project, u = makeurl(self.apiurl, ['staging', project,
'staging_projects', stage, 'staged_requests']) 'staging_projects', stage, 'staged_requests'])
try: try:
@ -933,7 +922,7 @@ class StagingAPI(object):
msg = msg.format(request_id) msg = msg.format(request_id)
raise oscerr.WrongArgs(msg) raise oscerr.WrongArgs(msg)
requestxml = "<requests><number>%s</number></requests>" % str(request_id) requestxml = f"<requests><request id='{request_id}'/></requests>"
u = makeurl(self.apiurl, ['staging', self.project, 'staging_projects', project, 'staged_requests']) u = makeurl(self.apiurl, ['staging', self.project, 'staging_projects', project, 'staged_requests'])
f = http_POST(u, data=requestxml) f = http_POST(u, data=requestxml)