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

adi: stage Non-Ring delete requests in adi projects

Browse Source 
This is now acceptable as the installcheck bot verifies that we
cannot remove binaries we still care for.
This commit is contained in:
Dominique Leuenberger 2021-02-23 14:59:28 +01:00
parent e68b5e0bce
commit a7bb286bd4
Signed by untrusted user: dimstar
GPG Key ID: 14C1CBBAC1E4B014
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osclib/adi_command.py
View File

@ -84,7 +84,7 @@ class AdiCommand:
requests.append(rf.load_request(p)) requests.append(rf.load_request(p))
splitter = RequestSplitter(self.api, requests, in_ring=False) splitter = RequestSplitter(self.api, requests, in_ring=False)
splitter.filter_add('./action[@type="submit"]') splitter.filter_add('./action[@type="submit" or @type="delete"]')
if len(wanted_requests): if len(wanted_requests):
splitter.filter_add_requests([str(p) for p in wanted_requests]) splitter.filter_add_requests([str(p) for p in wanted_requests])
# wanted_requests forces all requests into a single group. # wanted_requests forces all requests into a single group.

3
osclib/request_splitter.py
View File

@ -131,9 +131,6 @@ class RequestSplitter(object):
ring = self.ring_get(target_package) ring = self.ring_get(target_package)
if ring: if ring:
target.set('ring', ring) target.set('ring', ring)
elif not self.api.conlyadi and request_type == 'delete':
# Delete requests should always be considered in a ring.
target.set('ring', 'delete')
request_id = int(request.get('id')) request_id = int(request.get('id'))
if request_id in self.requests_ignored: if request_id in self.requests_ignored: