From c9b5529d411432df0c0799245a5cf8b2cb9eee15 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Mon, 2 Dec 2013 18:11:11 +0200 Subject: [PATCH] Used repo name as a part of release key PartOf and Release keys in repos.yaml are not uniq. Using them as a uniq identifier leads to breakage of workflow as they're continuously rewritten by repomaker for every snapshot for the repos with the same PartOf and Release keys in repos.yaml This change uses repo name instead of PartOf and Release. Name is uniq in repos.yaml, so this should hopefully fix the issue. Note, that this change requires repomaker to store release ids using repo name. This is done in this change: https://otctools.jf.intel.com/review/#/c/8189/ Change-Id: I63e033bff640ec2ae93e1d522dce55758aff2acd Signed-off-by: Ed Bartosh --- common/snapshot.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/snapshot.py b/common/snapshot.py index 8b5553f..1afe5ef 100644 --- a/common/snapshot.py +++ b/common/snapshot.py @@ -89,12 +89,11 @@ class Snapshot(object): @property def release_id(self): """Snapshot release id.""" - release_key = '%s-%s' % (self.repo['PartOf'], self.repo['Release']) try: - return self.backenddb.get_release_ids()[release_key] + return self.backenddb.get_release_ids()[self.repo_name] except BackendDBError, err: raise SnapshotError("Can't get release info for '%s' : %s" \ - % (release_key, str(err))) + % (self.repo_name, str(err))) @release_id.setter def release_id(self, value): -- 2.7.4