From a7bb286bd411f05c72045a78c8ba0fba4290b607 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 23 Feb 2021 14:59:28 +0100 Subject: [PATCH] adi: stage Non-Ring delete requests in adi projects This is now acceptable as the installcheck bot verifies that we cannot remove binaries we still care for. --- osclib/adi_command.py | 2 +- osclib/request_splitter.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/osclib/adi_command.py b/osclib/adi_command.py index c2c5f4c5..a8c8ad84 100644 --- a/osclib/adi_command.py +++ b/osclib/adi_command.py @@ -84,7 +84,7 @@ class AdiCommand: requests.append(rf.load_request(p)) 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): splitter.filter_add_requests([str(p) for p in wanted_requests]) # wanted_requests forces all requests into a single group. diff --git a/osclib/request_splitter.py b/osclib/request_splitter.py index 1b5ab471..145edc5c 100644 --- a/osclib/request_splitter.py +++ b/osclib/request_splitter.py @@ -131,9 +131,6 @@ class RequestSplitter(object): ring = self.ring_get(target_package) if 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')) if request_id in self.requests_ignored: