Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-02-23 19:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

BuildDependsPolicy: handle old python3-apt

Browse Source 
Very old versions, such as that run on the Ubuntu archive machine, don't
have the arch parameter.

Handle that by setting APT::Architecture instead
This commit is contained in:
Iain Lane 2020-06-11 11:47:06 +01:00 committed by Iain Lane
parent 9523425cb2
commit 07b9c517c8
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
britney.py
View File

@ -298,6 +298,7 @@ class Britney(object):
# initialize the apt_pkg back-end
apt_pkg.init()
apt_pkg.init_config()
# parse the command line arguments
self._policy_engine = PolicyEngine()

9
britney2/policies/policy.py
View File

@ -1074,7 +1074,14 @@ class BuildDependsPolicy(BasePolicy):
arch_results[arch] = BuildDepResult.OK
# for every dependency block (formed as conjunction of disjunction)
for block_txt in deps.split(','):
block = parse_src_depends(block_txt, False, arch)
try:
block = parse_src_depends(block_txt, False, arch)
except TypeError:
# old python3-apt didn't have the third argument
native_arch = apt_pkg.config["APT::Architecture"]
apt_pkg.config["APT::Architecture"] = arch
block = parse_src_depends(block_txt, False)
apt_pkg.config["APT::Architecture"] = native_arch
# Unlike regular dependencies, some clauses of the Build-Depends(-Arch|-Indep) can be
# filtered out by (e.g.) architecture restrictions. We need to cope with this while
# keeping block_txt and block aligned.