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

Store the pkg_id in undo instead of the package info

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2016-01-17 10:56:47 +00:00
parent f5a52fcec4
commit 19e54380c3
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
britney.py
View File

@ -2079,7 +2079,7 @@ class Britney(object):
pkg_data = binaries_t_a[binary] pkg_data = binaries_t_a[binary]
# save the old binary for undo # save the old binary for undo
undo['binaries'][p] = pkg_data undo['binaries'][p] = rm_pkg_id
if pkey not in eqv_set: if pkey not in eqv_set:
# all the reverse dependencies are affected by # all the reverse dependencies are affected by
# the change # the change
@ -2110,9 +2110,9 @@ 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]
undo['binaries'][item.package + "/" + item.architecture] = binaries_t_a[item.package]
version = binaries_t_a[item.package][VERSION] version = binaries_t_a[item.package][VERSION]
pkg_id = (item.package, version, item.architecture) pkg_id = (item.package, version, item.architecture)
undo['binaries'][item.package + "/" + item.architecture] = pkg_id
affected.add(pkg_id) affected.add(pkg_id)
affected.update(inst_tester.reverse_dependencies_of(pkg_id)) affected.update(inst_tester.reverse_dependencies_of(pkg_id))
del binaries_t_a[item.package] del binaries_t_a[item.package]
@ -2138,10 +2138,10 @@ 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]
# save the old binary package
undo['binaries'][p] = old_pkg_data
old_version = old_pkg_data[VERSION] old_version = old_pkg_data[VERSION]
old_pkg_id = (binary, old_version, parch) old_pkg_id = (binary, old_version, parch)
# save the old binary package
undo['binaries'][p] = old_pkg_id
if not equivalent_replacement: if not equivalent_replacement:
# all the reverse dependencies are affected by # all the reverse dependencies are affected by
# the change # the change
@ -2162,8 +2162,7 @@ class Britney(object):
# by this function # by this function
for (tundo, tpkg) in hint_undo: for (tundo, tpkg) in hint_undo:
if p in tundo['binaries']: if p in tundo['binaries']:
pv = tundo['binaries'][p][VERSION] tpkg_id = tundo['binaries'][p]
tpkg_id = (p, pv, parch)
affected.update(inst_tester.reverse_dependencies_of(tpkg_id)) affected.update(inst_tester.reverse_dependencies_of(tpkg_id))
# add/update the binary package from the source suite # add/update the binary package from the source suite
@ -2289,7 +2288,7 @@ class Britney(object):
# check if the action improved the uninstallability counters # check if the action improved the uninstallability counters
if not is_accepted and automatic_revert: if not is_accepted and automatic_revert:
undo_copy = list(reversed(undo_list)) undo_copy = list(reversed(undo_list))
undo_changes(undo_copy, self._inst_tester, self.sources, self.binaries) undo_changes(undo_copy, self._inst_tester, self.sources, self.binaries, self.all_binaries)
return (is_accepted, nuninst_after, undo_list, arch) return (is_accepted, nuninst_after, undo_list, arch)
@ -2490,7 +2489,7 @@ class Britney(object):
if not lundo: return if not lundo: return
lundo.reverse() lundo.reverse()
undo_changes(lundo, self._inst_tester, self.sources, self.binaries) undo_changes(lundo, self._inst_tester, self.sources, self.binaries, self.all_binaries)
def assert_nuninst_is_correct(self): def assert_nuninst_is_correct(self):

4
britney_util.py
View File

@ -114,7 +114,7 @@ def iter_except(func, exception, first=None):
pass pass
def undo_changes(lundo, inst_tester, sources, binaries, def undo_changes(lundo, inst_tester, sources, binaries, all_binary_packages,
BINARIES=BINARIES): BINARIES=BINARIES):
"""Undoes one or more changes to testing """Undoes one or more changes to testing
@ -171,7 +171,7 @@ def undo_changes(lundo, inst_tester, sources, binaries,
if p in binaries_t_a: if p in binaries_t_a:
rmpkgdata = binaries_t_a[p] rmpkgdata = binaries_t_a[p]
inst_tester.remove_testing_binary((binary, rmpkgdata[VERSION], arch)) inst_tester.remove_testing_binary((binary, rmpkgdata[VERSION], arch))
pkgdata = 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((binary, pkgdata[VERSION], arch))