From 37af83e927720726ddbcd1252f264d79d0469d91 Mon Sep 17 00:00:00 2001 From: Max Lin Date: Tue, 24 Nov 2015 19:35:54 +0800 Subject: [PATCH] Check subproject is exist before delete package It's workaound for https://progress.opensuse.org/issues/9646, suppose it is adi staging in case current project doesn't have ":DVD" subproject, and the package is exist in current project. --- osclib/stagingapi.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/osclib/stagingapi.py b/osclib/stagingapi.py index 019322ef..03b95849 100644 --- a/osclib/stagingapi.py +++ b/osclib/stagingapi.py @@ -697,7 +697,11 @@ class StagingAPI(object): ring_dvd = '{}:2-TestDVD'.format(self.crings) if self.ring_packages.get(pkg) == ring_dvd: - return project + ":DVD" + if not self.item_exists(project + ":DVD") and self.item_exists(project, pkg): + # assuming it is in adi staging, workaround for https://progress.opensuse.org/issues/9646 + return project + else: + return project + ":DVD" return project