Merge lp:~ted/hud/drop-dbus-workaround into lp:hud/14.10

Proposed by Ted Gould on 2014-09-15
Status: Merged
Approved by: Pete Woods on 2014-09-16
Approved revision: 397
Merged at revision: 396
Proposed branch: lp:~ted/hud/drop-dbus-workaround
Merge into: lp:hud/14.10
Diff against target: 35 lines (+0/-18)
2 files modified
data/hud.conf.in (+0/-9)
data/window-stack-bridge.conf.in (+0/-9)
To merge this branch: bzr merge lp:~ted/hud/drop-dbus-workaround
Reviewer Review Type Date Requested Status
Oliver Grawert 2014-09-15 Approve on 2014-09-16
PS Jenkins bot (community) continuous-integration Needs Fixing on 2014-09-15
Review via email: mp+234709@code.launchpad.net

Commit message

Drop DBus envvar workaround

Description of the change

To post a comment you must log in.
lp:~ted/hud/drop-dbus-workaround updated on 2014-09-15
397. By Ted Gould on 2014-09-15

Drop in window-stack too

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Oliver Grawert (ogra) wrote :

looks great

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/hud.conf.in'
2--- data/hud.conf.in 2014-05-06 16:13:24 +0000
3+++ data/hud.conf.in 2014-09-15 15:53:34 +0000
4@@ -5,13 +5,4 @@
5 stop on desktop-end
6 start on started dbus and ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger) or (xsession SESSION=ubuntu))
7
8-pre-start script
9- if [ -z $DBUS_SESSION_BUS_ADDRESS ]; then
10- echo "Working around missing DBUS_SESSION_BUS_ADDRESS variable"
11- printf "DuplicateSignature\0DBusSessionAddressNotSet" | /usr/share/apport/recoverable_problem -p `pidof -s -o 1 init`
12- . "${HOME}/.cache/upstart/dbus-session"
13- initctl set-env "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
14- fi
15-end script
16-
17 exec @pkglibexecdir@/hud-service
18
19=== modified file 'data/window-stack-bridge.conf.in'
20--- data/window-stack-bridge.conf.in 2013-10-09 09:15:55 +0000
21+++ data/window-stack-bridge.conf.in 2014-09-15 15:53:34 +0000
22@@ -3,13 +3,4 @@
23 start on started dbus
24 stop on desktop-end
25
26-pre-start script
27- if [ -z $DBUS_SESSION_BUS_ADDRESS ]; then
28- echo "Working around missing DBUS_SESSION_BUS_ADDRESS variable"
29- printf "DuplicateSignature\0DBusSessionAddressNotSet" | /usr/share/apport/recoverable_problem -p `pidof -s -o 1 init`
30- . "${HOME}/.cache/upstart/dbus-session"
31- initctl set-env "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
32- fi
33-end script
34-
35 exec @pkglibexecdir@/window-stack-bridge

Subscribers

People subscribed via source and target branches