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

[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 (in sync with RTM branch)

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 (but image download tests were done from other locations, as images.google.com now provides images via data URIs, which are currently unsupported)

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

[Ken VanDine (ken-vandine)]

Looks good

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 15:33:36 +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