Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-02-10 14:07:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

autopkgtest: filter conflicting packages

Browse Source 
We only want to add packages which conflict in testing, but don't
conflict in unstable. For those, the newer version (from unstable)
probably fixes the conflict.
This commit is contained in:
Ivo De Decker 2020-02-07 19:42:58 +00:00
parent 97c3b32f1f
commit c308361fc5
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
britney2/policies/autopkgtest.py
View File

@ -482,6 +482,7 @@ class AutopkgtestPolicy(BasePolicy):
def request_tests_for_source(self, item, arch, source_data_srcdist, pkg_arch_result):
pkg_universe = self.britney.pkg_universe
target_suite = self.suite_info.target_suite
source_suite = item.suite
sources_s = item.suite.sources
packages_s_a = item.suite.binaries[arch]
source_name = item.package
@ -548,8 +549,17 @@ class AutopkgtestPolicy(BasePolicy):
for binary in bin_triggers:
# broken is a frozenset{BinaryPackageId, ..}
broken = pkg_universe.negative_dependencies_of(binary)
# We'll figure out which version later
bin_broken.update(added_pkgs_compared_to_target_suite(broken, target_suite, invert=True))
broken_in_target = {p.package_name for p in target_suite.which_of_these_are_in_the_suite(broken)}
broken_in_source = {p.package_name for p in source_suite.which_of_these_are_in_the_suite(broken)}
# We want packages with a newer version in the source suite that
# no longer has the conflict. This is an approximation
broken_filtered = set(
p for p in broken if
p.package_name in broken_in_target and
p.package_name not in broken_in_source)
# We add the version in the target suite, but the code below will
# change it to the version in the source suite
bin_broken.update(broken_filtered)
bin_triggers.update(bin_broken)
triggers = set()