Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-28 10:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

britney: Remove out a tuple lookup in get_dependency_solvers

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2016-09-24 08:42:52 +00:00
parent f414b12130
commit cd7cdda61e
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
britney.py
View File

@ -1150,9 +1150,10 @@ class Britney(object):
as parameter. as parameter.
""" """
# retrieve the binary package from the specified suite and arch # retrieve the binary package from the specified suite and arch
package_s_a = self.binaries[suite][arch] packages_s_a = self.binaries[suite][arch]
package_t_a = self.binaries['testing'][arch] packages_t_a = self.binaries['testing'][arch]
binary_u = package_s_a[0][pkg] binaries_s_a = packages_s_a[0]
binary_u = binaries_s_a[pkg]
# local copies for better performance # local copies for better performance
parse_depends = apt_pkg.parse_depends parse_depends = apt_pkg.parse_depends
@ -1164,20 +1165,21 @@ class Britney(object):
return True return True
is_all_ok = True is_all_ok = True
# for every dependency block (formed as conjunction of disjunction) # for every dependency block (formed as conjunction of disjunction)
for block, block_txt in zip(parse_depends(deps, False), deps.split(',')): for block, block_txt in zip(parse_depends(deps, False), deps.split(',')):
# if the block is satisfied in testing, then skip the block # if the block is satisfied in testing, then skip the block
packages = get_dependency_solvers(block, package_t_a) packages = get_dependency_solvers(block, packages_t_a)
if packages: if packages:
for p in packages: for p in packages:
if p not in package_s_a[0]: if p not in binaries_s_a:
continue continue
excuse.add_sane_dep(package_s_a[0][p].source) excuse.add_sane_dep(binaries_s_a[p].source)
continue continue
# check if the block can be satisfied in the source suite, and list the solving packages # check if the block can be satisfied in the source suite, and list the solving packages
packages = get_dependency_solvers(block, package_s_a) packages = get_dependency_solvers(block, packages_s_a)
packages = [package_s_a[0][p].source for p in packages] packages = [packages_s_a[0][p].source for p in packages]
# if the dependency can be satisfied by the same source package, skip the block: # if the dependency can be satisfied by the same source package, skip the block:
# obviously both binary packages will enter testing together # obviously both binary packages will enter testing together