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

Proposed by Michael Sheldon on 2014-11-10
Status: Merged
Approved by: Ken VanDine on 2014-11-10
Approved revision: 137
Merged at revision: 137
Proposed branch: lp:~michael-sheldon/content-hub/fix-1390095-rtm
Merge into: lp:content-hub/rtm-14.09
Diff against target: 16 lines (+6/-1)
1 file modified
src/com/ubuntu/content/service/content-hub-peer-hook-wrapper.in (+6/-1)
To merge this branch: bzr merge lp:~michael-sheldon/content-hub/fix-1390095-rtm
Reviewer Review Type Date Requested Status
Ken VanDine 2014-11-10 Approve on 2014-11-10
Review via email: mp+241288@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Michael Sheldon (michael-sheldon) wrote :

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) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/com/ubuntu/content/service/content-hub-peer-hook-wrapper.in'
2--- src/com/ubuntu/content/service/content-hub-peer-hook-wrapper.in 2014-06-02 16:33:13 +0000
3+++ src/com/ubuntu/content/service/content-hub-peer-hook-wrapper.in 2014-11-10 15:33:36 +0000
4@@ -1,7 +1,12 @@
5 #!/bin/sh
6
7+# PackageKit clears all environment variables, so we get the UID and then read
8+# in $DBUS_SESSION_BUS_ADDRESS from /run/user/$UID/dbus-session
9+
10+USERID=`id -u`
11+
12 if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
13- [ -e $HOME/.cache/upstart/dbus-session ] && . $HOME/.cache/upstart/dbus-session || eval `dbus-launch --sh-syntax`
14+ [ -e /run/user/$USERID/dbus-session ] && . /run/user/$USERID/dbus-session
15 [ -n "$DBUS_SESSION_BUS_ADDRESS" ] && export DBUS_SESSION_BUS_ADDRESS
16 fi
17

Subscribers

People subscribed via source and target branches