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

Refactor excuse_unsat_dep and make it suite agnostic

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2018-07-22 15:45:46 +00:00
parent 861632e270
commit d5224f78cd
1 changed files with 14 additions and 10 deletions

20
britney.py

@ -1048,7 +1048,7 @@ class Britney(object):
# Utility methods for package analysis # Utility methods for package analysis
# ------------------------------------ # ------------------------------------
def excuse_unsat_deps(self, pkg, src, arch, suite, excuse, get_dependency_solvers=get_dependency_solvers): def excuse_unsat_deps(self, pkg, src, arch, source_suite, excuse, get_dependency_solvers=get_dependency_solvers):
"""Find unsatisfied dependencies for a binary package """Find unsatisfied dependencies for a binary package
This method analyzes the dependencies of the binary package specified This method analyzes the dependencies of the binary package specified
@ -1058,8 +1058,9 @@ 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
binaries_s_a, provides_s_a = self.binaries[suite][arch] target_suite = self.suite_info.target_suite
binaries_t_a, provides_t_a = self.binaries['testing'][arch] binaries_s_a, provides_s_a = source_suite.binaries[arch]
binaries_t_a, provides_t_a = target_suite.binaries[arch]
binary_u = binaries_s_a[pkg] binary_u = binaries_s_a[pkg]
# local copies for better performance # local copies for better performance
@ -1071,7 +1072,6 @@ 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
@ -1101,14 +1101,18 @@ class Britney(object):
continue continue
# for the solving packages, update the excuse to add the dependencies # for the solving packages, update the excuse to add the dependencies
for p in packages:
if arch not in self.options.break_arches: if arch not in self.options.break_arches:
if p in self.sources['testing'] and self.sources['testing'][p].version == self.sources[suite][p].version: sources_t = target_suite.sources
sources_s = source_suite.sources
for p in packages:
if p in sources_t and sources_t[p].version == sources_s[p].version:
excuse.add_dep("%s/%s" % (p, arch), arch) excuse.add_dep("%s/%s" % (p, arch), arch)
else: else:
excuse.add_dep(p, arch) excuse.add_dep(p, arch)
else: else:
for p in packages:
excuse.add_break_dep(p, arch) excuse.add_break_dep(p, arch)
return is_all_ok return is_all_ok
# Package analysis methods # Package analysis methods
@ -1236,7 +1240,7 @@ class Britney(object):
continue continue
# find unsatisfied dependencies for the new binary package # find unsatisfied dependencies for the new binary package
self.excuse_unsat_deps(pkg_name, src, arch, suite_name, excuse) self.excuse_unsat_deps(pkg_name, src, arch, source_suite, excuse)
# if the binary is not present in testing, then it is a new binary; # if the binary is not present in testing, then it is a new binary;
# in this case, there is something worth doing # in this case, there is something worth doing
@ -1425,7 +1429,7 @@ class Britney(object):
all_binaries = self.all_binaries all_binaries = self.all_binaries
for pkg_id in source_u.binaries: for pkg_id in source_u.binaries:
is_valid = self.excuse_unsat_deps(pkg_id.package_name, src, pkg_id.architecture, suite_name, excuse) is_valid = self.excuse_unsat_deps(pkg_id.package_name, src, pkg_id.architecture, source_suite, excuse)
if is_valid: if is_valid:
continue continue