Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-28 02:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

britney: Avoid some references to britney.{sources,binaries}

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2018-07-23 15:13:22 +00:00
parent dfbff18b5c
commit 97d707e5c0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
britney.py
View File

@ -332,8 +332,8 @@ class Britney(object):
# compute inverse Testsuite-Triggers: map, unifying all series # compute inverse Testsuite-Triggers: map, unifying all series
self.logger.info('Building inverse testsuite_triggers map') self.logger.info('Building inverse testsuite_triggers map')
self.testsuite_triggers = {} self.testsuite_triggers = {}
for suitemap in self.sources.values(): for suite in self.suite_info:
for src, data in suitemap.items(): for src, data in suite.sources.items():
for trigger in data.testsuite_triggers: for trigger in data.testsuite_triggers:
self.testsuite_triggers.setdefault(trigger, set()).add(src) self.testsuite_triggers.setdefault(trigger, set()).add(src)
@ -1327,7 +1327,7 @@ class Britney(object):
""" """
source_suite = self.suite_info[suite_name] source_suite = self.suite_info[suite_name]
source_u = self.sources[suite_name][src] source_u = source_suite.sources[src]
if source_u.is_fakesrc: if source_u.is_fakesrc:
# it is a fake package created to satisfy Britney implementation details; silently ignore it # it is a fake package created to satisfy Britney implementation details; silently ignore it
return False return False
@ -1555,9 +1555,9 @@ class Britney(object):
# this architecture then we assume it's ok. this allows for # this architecture then we assume it's ok. this allows for
# uploads to (t-)p-u which intentionally drop binary # uploads to (t-)p-u which intentionally drop binary
# packages # packages
if any(x for x in self.binaries[suite_name][arch][0].values() \ if any(x for x in source_suite.binaries[arch][0].values()
if x.source == src and x.source_version == source_u.version and \ if x.source == src and x.source_version == source_u.version and
x.architecture != 'all'): x.architecture != 'all'):
continue continue
# TODO: Find a way to avoid hardcoding pu/stable relation. # TODO: Find a way to avoid hardcoding pu/stable relation.

2
britney2/policies/autopkgtest.py
View File

@ -232,7 +232,7 @@ class AutopkgtestPolicy(BasePolicy):
elegible_for_bounty = False elegible_for_bounty = False
# skip/delay autopkgtests until new package is built somewhere # skip/delay autopkgtests until new package is built somewhere
binaries_info = self.britney.sources[suite][source_name] binaries_info = self.suite_info[suite].sources[source_name]
if not binaries_info.binaries: if not binaries_info.binaries:
self.logger.info('%s hasn''t been built anywhere, skipping autopkgtest policy', excuse.name) self.logger.info('%s hasn''t been built anywhere, skipping autopkgtest policy', excuse.name)
verdict = PolicyVerdict.REJECTED_TEMPORARILY verdict = PolicyVerdict.REJECTED_TEMPORARILY