From bda39f8ca0050a59674eb88282eef6a1ba8b3695 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 12 Nov 2017 07:50:49 +0000 Subject: [PATCH] Support :native in build-dependency relations Signed-off-by: Niels Thykier --- britney2/policies/policy.py | 2 +- britney2/utils.py | 23 ++++++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/britney2/policies/policy.py b/britney2/policies/policy.py index 8a548a2..e127825 100644 --- a/britney2/policies/policy.py +++ b/britney2/policies/policy.py @@ -663,7 +663,7 @@ class BuildDependsPolicy(BasePolicy): continue block = block[0] # if the block is satisfied in testing, then skip the block - if get_dependency_solvers(block, binaries_t_a, provides_t_a): + if get_dependency_solvers(block, binaries_t_a, provides_t_a, build_depends=True): # Satisfied in testing; all ok. continue diff --git a/britney2/utils.py b/britney2/utils.py index 113fb46..333a0fd 100644 --- a/britney2/utils.py +++ b/britney2/utils.py @@ -737,16 +737,23 @@ def read_sources_file(filename, sources=None, intern=sys.intern): return sources -def get_dependency_solvers(block, binaries_s_a, provides_s_a, *, empty_set=frozenset()): +def get_dependency_solvers(block, binaries_s_a, provides_s_a, *, build_depends=False, empty_set=frozenset()): """Find the packages which satisfy a dependency block This method returns the list of packages which satisfy a dependency block (as returned by apt_pkg.parse_depends) in a package table for a given suite and architecture (a la self.binaries[suite][arch]) - :param block: The dependency block as parsed by apt_pkg.parse_depends + It can also handle build-dependency relations if the named parameter + "build_depends" is set to True. In this case, block should be based + on the return value from apt_pkg.parse_src_depends. + + :param block: The dependency block as parsed by apt_pkg.parse_depends (or apt_pkg.parse_src_depends + if the "build_depends" is True) :param binaries_s_a: A dict mapping package names to the relevant BinaryPackage :param provides_s_a: A dict mapping package names to their providers (as generated by parse_provides) + :param build_depends: If True, treat the "block" parameter as a build-dependency relation rather than + a regular dependency relation. :param empty_set: Internal implementation detail / optimisation :return a list of package names solving the relation """ @@ -765,8 +772,18 @@ def get_dependency_solvers(block, binaries_s_a, provides_s_a, *, empty_set=froze # check the versioned dependency and architecture qualifier # (if present) if (op == '' and version == '') or apt_pkg.check_dep(package.version, op, version): - if archqual is None or (archqual == 'any' and package.multi_arch == 'allowed'): + if archqual is None: packages.append(name) + elif build_depends: + # Multi-arch handling for build-dependencies + # - :native is ok iff the target is arch:any + if archqual == 'native' and package.architecture != 'all': + packages.append(name) + else: + # Multi-arch handling for regular dependencies + # - :any is ok iff the target has "M-A: allowed" + if archqual == 'any' and package.multi_arch == 'allowed': + packages.append(name) # look for the package in the virtual packages list and loop on them for prov, prov_version in provides_s_a.get(name, empty_set):