Undo changes if the hint is not successful.

bzr-import-20160707
Fabio Tranchitella 19 years ago
parent 333b76f04c
commit 90a090767e

@ -2291,7 +2291,7 @@ class Britney:
nuninst_end, extra = None, None nuninst_end, extra = None, None
else: else:
if init: if init:
(nuninst_end, extra) = self.iter_packages(init, selected, hint=True) (nuninst_end, lundo) = self.iter_packages(init, selected, hint=True)
else: nuninst_end = None else: nuninst_end = None
(nuninst_end, extra) = self.iter_packages(upgrade_me, selected, nuninst=nuninst_end) (nuninst_end, extra) = self.iter_packages(upgrade_me, selected, nuninst=nuninst_end)
if not self.is_nuninst_asgood_generous(self.nuninst_orig, nuninst_end): if not self.is_nuninst_asgood_generous(self.nuninst_orig, nuninst_end):
@ -2315,7 +2315,7 @@ class Britney:
else: else:
if init: self.nuninst_orig = backup if init: self.nuninst_orig = backup
self.output_write("FAILED\n") self.output_write("FAILED\n")
if not earlyabort: return if not earlyabort and not init: return
# undo all the changes # undo all the changes
for (undo, pkg, pkg_name, suite) in lundo: for (undo, pkg, pkg_name, suite) in lundo:

Loading…
Cancel
Save