From 915b4a012d4d6509d794faf38611a303c5568894 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Tue, 29 Jan 2019 19:15:15 +0000 Subject: [PATCH] Since dpkg/1.19.1, "foo:native" is also valid for arch:all pkgs We allow this already now even though dpkg/1.19.1 is not in stable as it will not cause issues with upgrades (only dpkg-checkbuilddeps needed change, so it will not cause issues on the buildds as we can rely on dpkg from buster being present there). Signed-off-by: Niels Thykier --- britney2/utils.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/britney2/utils.py b/britney2/utils.py index 8a7c692..8907d6f 100644 --- a/britney2/utils.py +++ b/britney2/utils.py @@ -640,11 +640,10 @@ def get_dependency_solvers(block, binaries_s_a, provides_s_a, *, build_depends=F if (op == '' and version == '') or apt_pkg.check_dep(package.version, op, version): if archqual is None: packages.append(package) - elif build_depends: + elif build_depends and archqual == 'native': # Multi-arch handling for build-dependencies - # - :native is ok iff the target is arch:any - if archqual == 'native' and package.architecture != 'all': - packages.append(package) + # - :native is ok always (since dpkg 1.19.1) + packages.append(package) # Multi-arch handling for both build-dependencies and regular dependencies # - :any is ok iff the target has "M-A: allowed"