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

autopkgtest: simplify bin_triggers logic/naming

Browse Source
This commit is contained in:
Paul Gevers 2018-10-07 11:27:56 +02:00
parent caf83b9357
commit d038e7bbe6
No known key found for this signature in database
GPG Key ID: 9C5C99EB05BD750A
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
britney2/policies/autopkgtest.py
View File

@ -427,12 +427,12 @@ class AutopkgtestPolicy(BasePolicy):
# For all binaries found, add the set of unique source # For all binaries found, add the set of unique source
# packages to the list of triggers. # packages to the list of triggers.
bin_depends = set() bin_triggers = set()
bin_new = set(binaries_info.binaries) bin_new = set(binaries_info.binaries)
for binary in iter_except(bin_new.pop, KeyError): for binary in iter_except(bin_new.pop, KeyError):
if binary in bin_depends: if binary in bin_triggers:
continue continue
bin_depends.add(binary) bin_triggers.add(binary)
# Check if there is a dependency that is not # Check if there is a dependency that is not
# available in the target suite. # available in the target suite.
@ -459,9 +459,8 @@ class AutopkgtestPolicy(BasePolicy):
# check here as a binary package that is broken may be # check here as a binary package that is broken may be
# coming from a different source package in the source # coming from a different source package in the source
# suite. Nevermind. # suite. Nevermind.
bin_triggers = bin_depends.copy()
bin_broken = set() bin_broken = set()
for binary in bin_depends: for binary in bin_triggers:
# broken is a frozenset{BinaryPackageId, ..} # broken is a frozenset{BinaryPackageId, ..}
broken = pkg_universe.negative_dependencies_of(binary) broken = pkg_universe.negative_dependencies_of(binary)
names_testing = set() names_testing = set()
@ -473,8 +472,8 @@ class AutopkgtestPolicy(BasePolicy):
names_unstable.add(broken_bin.package_name) names_unstable.add(broken_bin.package_name)
for name in names_testing - names_unstable: for name in names_testing - names_unstable:
# We'll figure out which version later # We'll figure out which version later
bin_triggers.update(b for b in broken if b.package_name == name)
bin_broken.update(b for b in broken if b.package_name == name) bin_broken.update(b for b in broken if b.package_name == name)
bin_triggers.update(bin_broken)
triggers = set() triggers = set()
for binary in bin_triggers: for binary in bin_triggers: