From 0e30d5c170e4fb3da743c03504f37610d298c543 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Mon, 24 Oct 2016 19:42:05 +0000 Subject: [PATCH] Use suite-info to provide the excuses suffix Signed-off-by: Niels Thykier --- britney.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/britney.py b/britney.py index 398ddb2..9cefbf8 100755 --- a/britney.py +++ b/britney.py @@ -1311,9 +1311,13 @@ class Britney(object): # retrieve the source packages for testing and suite source_t = self.sources['testing'][src] source_u = self.sources[suite][src] + suite_info = self.suite_info[suite] + suffix = '' + if suite_info.excuses_suffix: + suffix = "_%s" % suite_info.excuses_suffix # build the common part of the excuse, which will be filled by the code below - ref = "%s/%s%s" % (src, arch, suite != 'unstable' and "_" + suite or "") + ref = "%s/%s%s" % (src, arch, suffix) excuse = Excuse(ref) excuse.set_vers(source_t.version, source_t.version) source_u.maintainer and excuse.set_maint(source_u.maintainer) @@ -1473,8 +1477,13 @@ class Britney(object): else: source_t = None + suite_info = self.suite_info[suite] + suffix = '' + if suite_info.excuses_suffix: + suffix = "_%s" % suite_info.excuses_suffix + # build the common part of the excuse, which will be filled by the code below - ref = "%s%s" % (src, suite != 'unstable' and "_" + suite or "") + ref = "%s%s" % (src, suffix) excuse = Excuse(ref) excuse.set_vers(source_t and source_t.version or None, source_u.version) source_u.maintainer and excuse.set_maint(source_u.maintainer)