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

builder.py: Make the code suite agnostic

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2018-07-22 10:23:27 +00:00
parent d0399f4eb0
commit 64d2bc4203
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
britney.py
View File

@ -361,7 +361,7 @@ class Britney(object):
} }
self.logger.info("Compiling Installability tester") self.logger.info("Compiling Installability tester")
self._inst_tester = build_installability_tester(self.binaries, self.options.architectures) self._inst_tester = build_installability_tester(self.suite_info, self.options.architectures)
if not self.options.nuninst_cache: if not self.options.nuninst_cache:
self.logger.info("Building the list of non-installable packages for the full archive") self.logger.info("Building the list of non-installable packages for the full archive")

16
britney2/installability/builder.py
View File

@ -21,20 +21,20 @@ from britney2.utils import ifilter_except, iter_except, get_dependency_solvers
from britney2.installability.solver import InstallabilitySolver from britney2.installability.solver import InstallabilitySolver
def build_installability_tester(binaries, archs): def build_installability_tester(suite_info, archs):
"""Create the installability tester""" """Create the installability tester"""
solvers = get_dependency_solvers solvers = get_dependency_solvers
builder = InstallabilityTesterBuilder() builder = InstallabilityTesterBuilder()
for (dist, arch) in product(binaries, archs): for (suite, arch) in product(suite_info, archs):
testing = (dist == 'testing') packages_s_a = suite.binaries[arch][0]
for pkgname in binaries[dist][arch][0]: for pkgname in packages_s_a:
pkgdata = binaries[dist][arch][0][pkgname] pkgdata = packages_s_a[pkgname]
pkg_id = pkgdata.pkg_id pkg_id = pkgdata.pkg_id
if not builder.add_binary(pkg_id, if not builder.add_binary(pkg_id,
essential=pkgdata.is_essential, essential=pkgdata.is_essential,
in_testing=testing): in_testing=suite.suite_class.is_target):
continue continue
depends = [] depends = []
@ -55,8 +55,8 @@ def build_installability_tester(binaries, archs):
for block in al: for block in al:
sat = set() sat = set()
for dep_dist in binaries: for dep_suite in suite_info:
dep_binaries_s_a, dep_provides_s_a = binaries[dep_dist][arch] dep_binaries_s_a, dep_provides_s_a = dep_suite.binaries[arch]
pkgs = solvers(block, dep_binaries_s_a, dep_provides_s_a) pkgs = solvers(block, dep_binaries_s_a, dep_provides_s_a)
for p in pkgs: for p in pkgs:
# version and arch is already interned, but solvers use # version and arch is already interned, but solvers use