Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-25 01:11:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract a compute_item_name method

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2019-01-03 19:46:42 +00:00 committed by Ivo De Decker
parent 97ed917db4
commit 82fa58df20
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
britney.py
View File

@ -209,7 +209,7 @@ from britney2.utils import (log_and_format_old_libraries, get_dependency_solvers
format_and_log_uninst, newly_uninst, format_and_log_uninst, newly_uninst,
write_excuses, write_heidi_delta, write_excuses, write_heidi_delta,
old_libraries, is_nuninst_asgood_generous, old_libraries, is_nuninst_asgood_generous,
clone_nuninst, clone_nuninst, compute_item_name,
invalidate_excuses, compile_nuninst, invalidate_excuses, compile_nuninst,
find_smooth_updateable_binaries, parse_provides, find_smooth_updateable_binaries, parse_provides,
MigrationConstraintException, MigrationConstraintException,
@ -801,10 +801,8 @@ class Britney(object):
sources_t = target_suite.sources sources_t = target_suite.sources
sources_s = source_suite.sources sources_s = source_suite.sources
for p in packages: for p in packages:
if p in sources_t and sources_t[p].version == sources_s[p].version: item_name = compute_item_name(sources_t, sources_s, p, arch)
excuse.add_dependency(DependencyType.DEPENDS, "%s/%s" % (p, arch), arch) excuse.add_dependency(DependencyType.DEPENDS, item_name, arch)
else:
excuse.add_dependency(DependencyType.DEPENDS, p, arch)
else: else:
for p in packages: for p in packages:
excuse.add_break_dep(p, arch) excuse.add_break_dep(p, arch)

8
britney2/policies/policy.py
View File

@ -13,7 +13,7 @@ from britney2 import SuiteClass
from britney2.hints import Hint, split_into_one_hint_per_package from britney2.hints import Hint, split_into_one_hint_per_package
from britney2.inputs.suiteloader import SuiteContentLoader from britney2.inputs.suiteloader import SuiteContentLoader
from britney2.policies import PolicyVerdict from britney2.policies import PolicyVerdict
from britney2.utils import get_dependency_solvers from britney2.utils import get_dependency_solvers, compute_item_name
from britney2 import DependencyType from britney2 import DependencyType
@ -821,10 +821,8 @@ class BuildDependsPolicy(BasePolicy):
# 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: for p in packages:
if arch not in self.options.break_arches: if arch not in self.options.break_arches:
if p in sources_t and sources_t[p].version == sources_s[p].version: item_name = compute_item_name(sources_t, sources_s, p, arch)
excuse.add_dependency(dep_type,"%s/%s" % (p, arch), arch) excuse.add_dependency(dep_type, item_name, arch)
else:
excuse.add_dependency(dep_type, p, arch)
if arch in results: if arch in results:
if results[arch] == BuildDepResult.FAILED: if results[arch] == BuildDepResult.FAILED:

6
britney2/utils.py
View File

@ -869,3 +869,9 @@ def parse_provides(provides_raw, pkg_id=None, logger=None):
part = (provided, provided_version, sys.intern(op)) part = (provided, provided_version, sys.intern(op))
nprov.append(part) nprov.append(part)
return nprov return nprov
def compute_item_name(sources_t, sources_s, source_name, parch):
if source_name in sources_t and sources_t[source_name].version == sources_s[source_name].version:
return "%s/%s" % (source_name, parch)
return source_name