Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-10-31 16:44:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid lying about orig-nuninst counters in force-hint

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2018-03-31 16:55:32 +00:00
parent 6d81e0b1fd
commit 9e6fcc0ed3
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
britney.py
View File

@ -2322,10 +2322,8 @@ class Britney(object):
upgrade_me.remove(x)
self.output_write("start: %s\n" % self.eval_nuninst(nuninst_start))
if not force:
self.output_write("orig: %s\n" % self.eval_nuninst(nuninst_start))
if init:
# init => a hint (e.g. "easy") - so do the hint run
(_, nuninst_end, undo_list, _) = self.try_migration(selected,
@ -2349,8 +2347,6 @@ class Britney(object):
if not recurse:
# easy or force-hint
if force:
self.output_write("orig: %s\n" % nuninst_end_str)
self.output_write("easy: %s\n" % nuninst_end_str)
if not force:
@ -2377,10 +2373,7 @@ class Britney(object):
# Result accepted either by force or by being better than the original result.
self.output_write("final: %s\n" % ",".join(sorted( x.uvname for x in selected )))
self.output_write("start: %s\n" % self.eval_nuninst(nuninst_start))
if not force:
self.output_write(" orig: %s\n" % self.eval_nuninst(self.nuninst_orig))
else:
self.output_write(" orig: %s\n" % nuninst_end_str)
self.output_write(" end: %s\n" % nuninst_end_str)
if force:
self.output_write("force breaks:\n")