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

Remove dead case in undo code

Browse Source 
The doop_source method does not generate any /binary/ undo items,
where the package name starts with "-".  This fact allows us to remove
a branch in the undo code.  This also happens to be fortunate because
the call to "inst_tester.remove_testing_binary" in that branch happens
to be wrong.

Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2016-11-12 11:44:23 +00:00
parent 636f349def
commit dd426c81fa
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
britney2/utils.py
View File

@ -144,16 +144,11 @@ def undo_changes(lundo, inst_tester, sources, binaries, all_binary_packages):
for (undo, item) in lundo:
for p in undo['binaries']:
binary, arch = p
if binary[0] == "-":
version = binaries["testing"][arch][0][binary].version
del binaries['testing'][arch][0][binary[1:]]
inst_tester.remove_testing_binary(binary, version, arch)
else:
binaries_t_a = binaries['testing'][arch][0]
assert binary not in binaries_t_a
pkgdata = all_binary_packages[undo['binaries'][p]]
binaries_t_a[binary] = pkgdata
inst_tester.add_testing_binary(pkgdata.pkg_id)
binaries_t_a = binaries['testing'][arch][0]
assert binary not in binaries_t_a
pkgdata = all_binary_packages[undo['binaries'][p]]
binaries_t_a[binary] = pkgdata
inst_tester.add_testing_binary(pkgdata.pkg_id)
# STEP 4
# undo all changes to virtual packages