Browse Source

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 <niels@thykier.net>
devuan-deployment
Niels Thykier 1 year ago
parent
commit
915b4a012d
No known key found for this signature in database GPG Key ID: A65B78DBE67C7AAC
1 changed files with 3 additions and 4 deletions
  1. +3
    -4
      britney2/utils.py

+ 3
- 4
britney2/utils.py View File

@@ -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"


Loading…
Cancel
Save