From dd426c81faf812a3059b449de8d71483583102d3 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 12 Nov 2016 11:44:23 +0000 Subject: [PATCH] Remove dead case in undo code 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 --- britney2/utils.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/britney2/utils.py b/britney2/utils.py index 5a11c61..bdfca50 100644 --- a/britney2/utils.py +++ b/britney2/utils.py @@ -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