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

Reuse pkg_ids instead of creating them ad-hoc

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2016-05-16 06:28:36 +00:00
parent 71d181aa83
commit bee0a99528
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
britney.py
View File

@ -667,9 +667,8 @@ class Britney(object):
testing = (dist == 'testing') testing = (dist == 'testing')
for pkgname in binaries[dist][arch][0]: for pkgname in binaries[dist][arch][0]:
pkgdata = binaries[dist][arch][0][pkgname] pkgdata = binaries[dist][arch][0][pkgname]
version = pkgdata.version pkg_id = pkgdata.pkg_id
t = (pkgname, version, arch) if not builder.add_binary(pkg_id, essential=pkgdata.is_essential,
if not builder.add_binary(t, essential=pkgdata.is_essential,
in_testing=testing): in_testing=testing):
continue continue
@ -684,7 +683,7 @@ class Britney(object):
if pkgdata.conflicts: if pkgdata.conflicts:
conflicts = apt_pkg.parse_depends(pkgdata.conflicts, False) conflicts = apt_pkg.parse_depends(pkgdata.conflicts, False)
with builder.relation_builder(t) as relations: with builder.relation_builder(pkg_id) as relations:
for (al, dep) in [(depends, True), \ for (al, dep) in [(depends, True), \
(conflicts, False)]: (conflicts, False)]:
@ -700,14 +699,14 @@ class Britney(object):
# the package name extracted from the field and it is therefore # the package name extracted from the field and it is therefore
# not interned. # not interned.
pdata = dep_packages_s_a[0][p] pdata = dep_packages_s_a[0][p]
pt = (sys.intern(p), pdata.version, arch) dep_pkg_id = pdata.pkg_id
if dep: if dep:
sat.add(pt) sat.add(dep_pkg_id)
elif t != pt: elif pkg_id != dep_pkg_id:
# if t satisfies its own # if t satisfies its own
# conflicts relation, then it # conflicts relation, then it
# is using §7.6.2 # is using §7.6.2
relations.add_breaks(pt) relations.add_breaks(dep_pkg_id)
if dep: if dep:
if len(block) != 1: if len(block) != 1:
relations.add_dependency_clause(sat) relations.add_dependency_clause(sat)
@ -849,7 +848,7 @@ class Britney(object):
old_pkg_data = packages[pkg] old_pkg_data = packages[pkg]
if apt_pkg.version_compare(old_pkg_data.version, version) > 0: if apt_pkg.version_compare(old_pkg_data.version, version) > 0:
continue continue
old_pkg_id = (pkg, old_pkg_data.version, arch) old_pkg_id = old_pkg_data.pkg_id
old_src_binaries = srcdist[old_pkg_data[SOURCE]][BINARIES] old_src_binaries = srcdist[old_pkg_data[SOURCE]][BINARIES]
old_src_binaries.remove(old_pkg_id) old_src_binaries.remove(old_pkg_id)
# This may seem weird at first glance, but the current code rely # This may seem weird at first glance, but the current code rely
@ -1891,8 +1890,7 @@ class Britney(object):
nuninst[arch] = set() nuninst[arch] = set()
for pkg_name in binaries[arch][0]: for pkg_name in binaries[arch][0]:
pkgdata = binaries[arch][0][pkg_name] pkgdata = binaries[arch][0][pkg_name]
pkg_id = (pkg_name, pkgdata.version, arch) r = inst_tester.is_installable(pkgdata.pkg_id)
r = inst_tester.is_installable(pkg_id)
if not r: if not r:
nuninst[arch].add(pkg_name) nuninst[arch].add(pkg_name)
@ -2162,17 +2160,17 @@ class Britney(object):
eqv_table = {} eqv_table = {}
for binary, version, parch in rms: for rm_pkg_id in rms:
binary, _, parch = rm_pkg_id
key = (binary, parch) key = (binary, parch)
eqv_table[key] = version eqv_table[key] = rm_pkg_id
for p1 in updates: for new_pkg_id in updates:
binary, _, parch = p1 binary, _, parch = new_pkg_id
key = (binary, parch) key = (binary, parch)
old_version = eqv_table.get(key) old_pkg_id = eqv_table.get(key)
if old_version is not None: if old_pkg_id is not None:
p2 = (binary, old_version, parch) if inst_tester.are_equivalent(new_pkg_id, old_pkg_id):
if inst_tester.are_equivalent(p1, p2):
eqv_set.add(key) eqv_set.add(key)
# remove all the binaries which aren't being smooth updated # remove all the binaries which aren't being smooth updated
@ -2214,8 +2212,7 @@ class Britney(object):
# updates but not supported as a manual hint # updates but not supported as a manual hint
elif item.package in packages_t[item.architecture][0]: elif item.package in packages_t[item.architecture][0]:
binaries_t_a = packages_t[item.architecture][0] binaries_t_a = packages_t[item.architecture][0]
version = binaries_t_a[item.package].version pkg_id = binaries_t_a[item.package].pkg_id
pkg_id = (item.package, version, item.architecture)
undo['binaries'][(item.package, item.architecture)] = pkg_id undo['binaries'][(item.package, item.architecture)] = pkg_id
affected_pos.update(inst_tester.reverse_dependencies_of(pkg_id)) affected_pos.update(inst_tester.reverse_dependencies_of(pkg_id))
del binaries_t_a[item.package] del binaries_t_a[item.package]
@ -2240,8 +2237,7 @@ class Britney(object):
# all of its reverse dependencies as affected # all of its reverse dependencies as affected
if binary in binaries_t_a: if binary in binaries_t_a:
old_pkg_data = binaries_t_a[binary] old_pkg_data = binaries_t_a[binary]
old_version = old_pkg_data.version old_pkg_id = old_pkg_data.pkg_id
old_pkg_id = (binary, old_version, parch)
# save the old binary package # save the old binary package
undo['binaries'][key] = old_pkg_id undo['binaries'][key] = old_pkg_id
if not equivalent_replacement: if not equivalent_replacement:

2
britney_util.py
View File

@ -152,7 +152,7 @@ def undo_changes(lundo, inst_tester, sources, binaries, all_binary_packages,
assert binary not in binaries_t_a assert binary not in binaries_t_a
pkgdata = all_binary_packages[undo['binaries'][p]] pkgdata = all_binary_packages[undo['binaries'][p]]
binaries_t_a[binary] = pkgdata binaries_t_a[binary] = pkgdata
inst_tester.add_testing_binary((binary, pkgdata.version, arch)) inst_tester.add_testing_binary(pkgdata.pkg_id)
# STEP 4 # STEP 4
# undo all changes to virtual packages # undo all changes to virtual packages