Merge lp:~mikemc/ubuntuone-control-panel/fix-lint-indent into lp:ubuntuone-control-panel

Proposed by Mike McCracken
Status: Merged
Approved by: Natalia Bidart
Approved revision: 407
Merged at revision: 407
Proposed branch: lp:~mikemc/ubuntuone-control-panel/fix-lint-indent
Merge into: lp:ubuntuone-control-panel
Diff against target: 12 lines (+1/-1)
1 file modified
setup.py (+1/-1)
To merge this branch: bzr merge lp:~mikemc/ubuntuone-control-panel/fix-lint-indent
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Review via email: mp+183531@code.launchpad.net

Commit message

- Fix a lint issue that was causing build failure on saucy

Description of the change

- Fix a lint issue that was causing build failure on saucy

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'setup.py'
--- setup.py 2013-05-28 22:00:15 +0000
+++ setup.py 2013-09-02 19:59:19 +0000
@@ -113,7 +113,7 @@
113 (qrc_file, py_file)) > 0:113 (qrc_file, py_file)) > 0:
114 self.warn('Unable to generate python module {py_file}'114 self.warn('Unable to generate python module {py_file}'
115 ' for resource file {qrc_file}'.format(115 ' for resource file {qrc_file}'.format(
116 py_file=py_file, qrc_file=qrc_file))116 py_file=py_file, qrc_file=qrc_file))
117 if not os.path.exists(py_file) or not file(py_file).read():117 if not os.path.exists(py_file) or not file(py_file).read():
118 raise SystemExit(1)118 raise SystemExit(1)
119 else:119 else:

Subscribers

People subscribed via source and target branches