Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/uitk_more_blank_lines into lp:ubuntu-ui-toolkit/staging

Proposed by Timo Jyrinki
Status: Merged
Approved by: Zsombor Egri
Approved revision: 2148
Merged at revision: 2149
Proposed branch: lp:~timo-jyrinki/ubuntu-ui-toolkit/uitk_more_blank_lines
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 23 lines (+2/-0)
2 files modified
.bazaar/plugins/makecheck_ubuntu_ui_toolkit.py (+1/-0)
.bazaar/plugins/packaging_sorting.py (+1/-0)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu-ui-toolkit/uitk_more_blank_lines
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Zsombor Egri Approve
Review via email: mp+311160@code.launchpad.net

Commit message

More blank lines.

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :
Revision history for this message
Zsombor Egri (zsombi) wrote :

Harmless, seems...

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bazaar/plugins/makecheck_ubuntu_ui_toolkit.py'
--- .bazaar/plugins/makecheck_ubuntu_ui_toolkit.py 2014-07-14 17:34:44 +0000
+++ .bazaar/plugins/makecheck_ubuntu_ui_toolkit.py 2016-11-17 15:03:35 +0000
@@ -35,6 +35,7 @@
35 if (subprocess.call("make check", shell=True) != 0):35 if (subprocess.call("make check", shell=True) != 0):
36 raise errors.BzrError("Tests failed, fix them before commit!")36 raise errors.BzrError("Tests failed, fix them before commit!")
3737
38
38branch.Branch.hooks.install_named_hook('pre_commit',39branch.Branch.hooks.install_named_hook('pre_commit',
39 execute_makecheck,40 execute_makecheck,
40 'make check pre-commit')41 'make check pre-commit')
4142
=== modified file '.bazaar/plugins/packaging_sorting.py'
--- .bazaar/plugins/packaging_sorting.py 2016-05-16 06:37:48 +0000
+++ .bazaar/plugins/packaging_sorting.py 2016-11-17 15:03:35 +0000
@@ -52,6 +52,7 @@
5252
53 subprocess.call(["rm", "-rf", "debian-packaging-wraptest-temporary"])53 subprocess.call(["rm", "-rf", "debian-packaging-wraptest-temporary"])
5454
55
55branch.Branch.hooks.install_named_hook("pre_commit",56branch.Branch.hooks.install_named_hook("pre_commit",
56 pre_commit_hook,57 pre_commit_hook,
57 "Check packaging sorting")58 "Check packaging sorting")

Subscribers

People subscribed via source and target branches