Merge lp:~michael-sheldon/content-hub/fix-1390095 into lp:content-hub

[Michael Sheldon]

Update click hook wrapper to account for change in dbus-session file.

Update click hook wrapper to account for change in dbus-session file.

[Michael Sheldon (michael-sheldon)]

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

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * Yes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/content-hub-ci/206/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/206/rebuild

review: Approve (continuous-integration)

[Oliver Grawert (ogra)]

clear NACK

please get rid of this dependency it caused a lot of havoc in the past (multiple running dbus seeion daemons with different addresses etc) and breaks AP testing completely ... we took quite some effort to get rid of it from the image in trusty.

as i said on IRC, it is ok to temporary still use /run/user/$UID/dbus-session ... but long term we need a clean solution that does not expose a security relevant var in a file and simply hands it over from the calling environment.

review: Needs Fixing

[lp:~michael-sheldon/content-hub/fix-1390095]

165. By Michael Sheldon on 2014-11-10

Remove dbus-launch fallback

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:165
http://jenkins.qa.ubuntu.com/job/content-hub-ci/207/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/207/rebuild

review: Approve (continuous-integration)

[Oliver Grawert (ogra)]

looks good now

review: Approve

[Ken VanDine (ken-vandine)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
 * Yes, tested on mako.

Did CI run pass? If not, please explain why.
 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
 * Yes

review: Approve

=== modified file 'src/com/ubuntu/content/service/content-hub-peer-hook-wrapper.in'
--- src/com/ubuntu/content/service/content-hub-peer-hook-wrapper.in	2014-06-02 16:33:13 +0000
+++ src/com/ubuntu/content/service/content-hub-peer-hook-wrapper.in	2014-11-10 12:58:07 +0000
@@ -1,7 +1,12 @@
 #!/bin/sh 
 
+# PackageKit clears all environment variables, so we get the UID and then read
+# in $DBUS_SESSION_BUS_ADDRESS from /run/user/$UID/dbus-session
+
+USERID=`id -u`
+
 if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-  [ -e $HOME/.cache/upstart/dbus-session ] && . $HOME/.cache/upstart/dbus-session || eval `dbus-launch --sh-syntax`
+  [ -e /run/user/$USERID/dbus-session ] && . /run/user/$USERID/dbus-session
   [ -n "$DBUS_SESSION_BUS_ADDRESS" ] && export DBUS_SESSION_BUS_ADDRESS
 fi