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

merge lp:~mathieu-tl/britney/whitespace

Browse Source
This commit is contained in:
Colin Watson 2013-11-26 10:48:17 +00:00
commit 37072e9c5e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
britney.py
View File

@ -2408,7 +2408,7 @@ class Britney(object):
if not force: if not force:
self.output_write(eval_uninst(self.options.architectures, self.output_write(eval_uninst(self.options.architectures,
newly_uninst(nuninst_start, nuninst_end)) + "\n") newly_uninst(nuninst_start, nuninst_end)))
if force or self.is_nuninst_asgood_generous(self.nuninst_orig, nuninst_end): if force or self.is_nuninst_asgood_generous(self.nuninst_orig, nuninst_end):
# Result accepted either by force or by being better than the original result. # Result accepted either by force or by being better than the original result.
@ -2424,7 +2424,7 @@ class Britney(object):
if force: if force:
self.output_write("force breaks:\n") self.output_write("force breaks:\n")
self.output_write(eval_uninst(self.options.architectures, self.output_write(eval_uninst(self.options.architectures,
newly_uninst(nuninst_start, nuninst_end)) + "\n") newly_uninst(nuninst_start, nuninst_end)))
self.output_write("SUCCESS (%d/%d)\n" % (len(actions or self.upgrade_me), len(extra))) self.output_write("SUCCESS (%d/%d)\n" % (len(actions or self.upgrade_me), len(extra)))
self.nuninst_orig = nuninst_end self.nuninst_orig = nuninst_end
self.all_selected += [x.uvname for x in selected] self.all_selected += [x.uvname for x in selected]
@ -2440,6 +2440,7 @@ class Britney(object):
lundo.reverse() lundo.reverse()
undo_changes(lundo, self.systems, self.sources, self.binaries) undo_changes(lundo, self.systems, self.sources, self.binaries)
self.output_write("\n")