mirror of
https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
synced 2025-05-23 16:31:32 +00:00
Use suite-info to provide the excuses suffix
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
parent
50d4d45c59
commit
0e30d5c170
13
britney.py
13
britney.py
@ -1311,9 +1311,13 @@ class Britney(object):
|
|||||||
# retrieve the source packages for testing and suite
|
# retrieve the source packages for testing and suite
|
||||||
source_t = self.sources['testing'][src]
|
source_t = self.sources['testing'][src]
|
||||||
source_u = self.sources[suite][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
|
# 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 = Excuse(ref)
|
||||||
excuse.set_vers(source_t.version, source_t.version)
|
excuse.set_vers(source_t.version, source_t.version)
|
||||||
source_u.maintainer and excuse.set_maint(source_u.maintainer)
|
source_u.maintainer and excuse.set_maint(source_u.maintainer)
|
||||||
@ -1473,8 +1477,13 @@ class Britney(object):
|
|||||||
else:
|
else:
|
||||||
source_t = None
|
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
|
# 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 = Excuse(ref)
|
||||||
excuse.set_vers(source_t and source_t.version or None, source_u.version)
|
excuse.set_vers(source_t and source_t.version or None, source_u.version)
|
||||||
source_u.maintainer and excuse.set_maint(source_u.maintainer)
|
source_u.maintainer and excuse.set_maint(source_u.maintainer)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user