Merge lp:~cyphermox/britney/whitespace into lp:~ubuntu-release/britney/britney2-ubuntu

Proposed by Mathieu Trudel-Lapierre
Status: Merged
Approved by: Colin Watson
Approved revision: 383
Merged at revision: 390
Proposed branch: lp:~cyphermox/britney/whitespace
Merge into: lp:~ubuntu-release/britney/britney2-ubuntu
Diff against target: 26 lines (+3/-2)
1 file modified
britney.py (+3/-2)
To merge this branch: bzr merge lp:~cyphermox/britney/whitespace
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+196413@code.launchpad.net

This proposal supersedes a proposal from 2013-11-22.

Description of the change

Fix whitespace between blocks of package installation checks.

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote : Posted in a previous version of this proposal

Hmm, looks like there's been an issue with the branch I used to make the commit.. Setting this back to work in progress

Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'britney.py'
2--- britney.py 2013-11-14 15:37:50 +0000
3+++ britney.py 2013-11-23 00:49:12 +0000
4@@ -2408,7 +2408,7 @@
5
6 if not force:
7 self.output_write(eval_uninst(self.options.architectures,
8- newly_uninst(nuninst_start, nuninst_end)) + "\n")
9+ newly_uninst(nuninst_start, nuninst_end)))
10
11 if force or self.is_nuninst_asgood_generous(self.nuninst_orig, nuninst_end):
12 # Result accepted either by force or by being better than the original result.
13@@ -2424,7 +2424,7 @@
14 if force:
15 self.output_write("force breaks:\n")
16 self.output_write(eval_uninst(self.options.architectures,
17- newly_uninst(nuninst_start, nuninst_end)) + "\n")
18+ newly_uninst(nuninst_start, nuninst_end)))
19 self.output_write("SUCCESS (%d/%d)\n" % (len(actions or self.upgrade_me), len(extra)))
20 self.nuninst_orig = nuninst_end
21 self.all_selected += [x.uvname for x in selected]
22@@ -2440,6 +2440,7 @@
23 lundo.reverse()
24
25 undo_changes(lundo, self.systems, self.sources, self.binaries)
26+ self.output_write("\n")
27
28
29

Subscribers

People subscribed via source and target branches