Merge lp:~afrantzis/unity8/fix-1371597-remove-stale-trusted-socket into lp:unity8

[Alexandros Frantzis]

Remove stale trusted socket before starting unity8 from upstart (LP: #1371597)

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

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

* Did you make sure that your branch does not contain spurious tags?
Yes.

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1284
http://jenkins.qa.ubuntu.com/job/unity8-ci/4354/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4999/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1355
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1448
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4751/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6251
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6251/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13469

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

review: Needs Fixing (continuous-integration)

[Ying-Chun Liu (paulliu)]

Tested. It does clean the trusted socket.

 * 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, unrelated reasons.

review: Approve

[Michael Zanetti (mzanetti)]

please strip stale tags.

This also uses the outdated checklist which doesn't have the check for stale tags in it.

review: Needs Fixing

[lp:~afrantzis/unity8/fix-1371597-remove-stale-trusted-socket]

1288. By Alexandros Frantzis on 2014-09-23

Remove stale trusted socket before starting unity8 from upstart

[Alexandros Frantzis (afrantzis)]

> please strip stale tags.

Done. Repushed basing on a clean unity8 branch.

> This also uses the outdated checklist which doesn't have the check for stale tags in it.

Fixed.

[Albert Astals Cid (aacid)]

Remote "broken" tags are still there, use http://people.canonical.com/~msawicz/unity8/strip-u8-tags.py to help them die

review: Needs Fixing

[Albert Astals Cid (aacid)]

remote broken tags are gone, reapproving.

[Albert Astals Cid (aacid)]

review: Abstain

[Alexandros Frantzis (afrantzis)]

> Remote "broken" tags are still there, use http://people.canonical.com/~msawicz/unity8/strip-u8-tags.py to help them die

Thanks. Fixed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1288
http://jenkins.qa.ubuntu.com/job/unity8-ci/4377/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5084/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1378
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1471
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1471
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4832/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6336
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6336/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13590

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

tags gone. thanks. landing this soon

review: Abstain

=== modified file 'data/unity8.conf'
--- data/unity8.conf	2014-08-11 19:03:22 +0000
+++ data/unity8.conf	2014-09-23 12:31:47 +0000
@@ -34,11 +34,15 @@
         gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
     fi
 
-    # Remove the socket if still there
+    # Remove the normal and trusted sockets if still there
     if [ -S "$MIR_SERVER_FILE" ]; then
         rm "$MIR_SERVER_FILE"
     fi
 
+    if [ -S "${MIR_SERVER_FILE}_trusted" ]; then
+        rm "${MIR_SERVER_FILE}_trusted"
+    fi
+
     initctl set-env --global MIR_SERVER_PROMPT_FILE=1
 
     initctl emit --no-wait indicator-services-start