From 2c9aa4eb9828179124ff767002962395ed7df28f Mon Sep 17 00:00:00 2001 From: Max Lin Date: Fri, 8 Sep 2017 16:18:33 +0800 Subject: [PATCH] stagingapi: rm_from_prj() remove the main package in the last --- osclib/stagingapi.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/osclib/stagingapi.py b/osclib/stagingapi.py index 887b6e27..f39c89b3 100644 --- a/osclib/stagingapi.py +++ b/osclib/stagingapi.py @@ -836,7 +836,6 @@ class StagingAPI(object): subprj = self.map_ring_package_to_subject(project, package) if self._supersede: self.is_package_disabled(subprj, package, store=True) - delete_package(self.apiurl, subprj, package, force=True, msg=msg) for sub_prj, sub_pkg in self.get_sub_packages(package, project): sub_prj = self.map_ring_package_to_subject(project, sub_pkg) @@ -845,6 +844,9 @@ class StagingAPI(object): if sub_prj != subprj: # if different to the main package's prj delete_package(self.apiurl, sub_prj, sub_pkg, force=True, msg=msg) + # Delete the main package in the last + delete_package(self.apiurl, subprj, package, force=True, msg=msg) + self.set_review(request_id, project, state=review, msg=msg) def is_package_disabled(self, project, package, store=False):