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

Proposed by Timo Jyrinki on 2016-11-17
Status: Merged
Approved by: Zsombor Egri on 2016-11-18
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 on 2016-11-18
Zsombor Egri 2016-11-17 Approve on 2016-11-18
Review via email: mp+311160@code.launchpad.net

Commit message

More blank lines.

To post a comment you must log in.
Zsombor Egri (zsombi) wrote :

Harmless, seems...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bazaar/plugins/makecheck_ubuntu_ui_toolkit.py'
2--- .bazaar/plugins/makecheck_ubuntu_ui_toolkit.py 2014-07-14 17:34:44 +0000
3+++ .bazaar/plugins/makecheck_ubuntu_ui_toolkit.py 2016-11-17 15:03:35 +0000
4@@ -35,6 +35,7 @@
5 if (subprocess.call("make check", shell=True) != 0):
6 raise errors.BzrError("Tests failed, fix them before commit!")
7
8+
9 branch.Branch.hooks.install_named_hook('pre_commit',
10 execute_makecheck,
11 'make check pre-commit')
12
13=== modified file '.bazaar/plugins/packaging_sorting.py'
14--- .bazaar/plugins/packaging_sorting.py 2016-05-16 06:37:48 +0000
15+++ .bazaar/plugins/packaging_sorting.py 2016-11-17 15:03:35 +0000
16@@ -52,6 +52,7 @@
17
18 subprocess.call(["rm", "-rf", "debian-packaging-wraptest-temporary"])
19
20+
21 branch.Branch.hooks.install_named_hook("pre_commit",
22 pre_commit_hook,
23 "Check packaging sorting")

Subscribers

People subscribed via source and target branches