Merge lp:~mzanetti/unity8/fix-commithook into lp:unity8

[Michael Zanetti]

make the "make test" commit hook work again

 * Are there any related MPs required for this MP to build/function as expected? Please list.

N/A

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

 * If you changed the UI, has there been a design review?

N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:780
http://jenkins.qa.ubuntu.com/job/unity8-ci/2610/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3773
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1480
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1135
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1135/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1131
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3642
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4258
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4258/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3775
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3775/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6073
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5134

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2610/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Shows how much we use this ^_^

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
No, doesn't matter, unrelated

review: Approve

[Michael Zanetti (mzanetti)]

> Shows how much we use this ^_^

I actually use it all the time. Thing is, when we moved the QML it silently failed and I only noticed it when being slapped by jenkins and debuild failing on the whitespace test after working for an hour.

=== modified file '.bazaar/plugins/makecheck_unity_phablet.py'
--- .bazaar/plugins/makecheck_unity_phablet.py	2013-06-28 21:06:13 +0000
+++ .bazaar/plugins/makecheck_unity_phablet.py	2014-03-24 16:24:47 +0000
@@ -18,7 +18,7 @@
 from bzrlib.urlutils import dirname, local_path_from_url
 
 def execute_makecheck(local_branch, master_branch, old_revision_number, old_revision_id, future_revision_number, future_revision_id, tree_delta, future_tree):
-    if not master_branch.basis_tree().has_filename("Shell.qml"):
+    if not master_branch.basis_tree().has_filename("qml/Shell.qml"):
         return
 
     os.chdir(local_path_from_url(master_branch.base))