Unity HUD

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

  1. drop-dbus-workaround
  2. Merge into trunk.14.10
Proposed by Ted Gould
Status: Merged
Approved by: Pete Woods
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 Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+234709@code.launchpad.net

Commit message

Drop DBus envvar workaround

Description of the change

Seems that we don't need it anymore:

https://errors.ubuntu.com/bucket/?id=DBusSessionAddressNotSet

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

Drop in window-stack too

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:397
http://jenkins.qa.ubuntu.com/job/hud-ci/299/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-utopic-amd64-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-utopic-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-utopic-i386-ci/14/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
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
=== modified file 'data/hud.conf.in'
--- data/hud.conf.in 2014-05-06 16:13:24 +0000
+++ data/hud.conf.in 2014-09-15 15:53:34 +0000
@@ -5,13 +5,4 @@
5stop on desktop-end5stop on desktop-end
6start on started dbus and ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger) or (xsession SESSION=ubuntu))6start on started dbus and ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger) or (xsession SESSION=ubuntu))
77
8pre-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
15end script
16
17exec @pkglibexecdir@/hud-service8exec @pkglibexecdir@/hud-service
189
=== modified file 'data/window-stack-bridge.conf.in'
--- data/window-stack-bridge.conf.in 2013-10-09 09:15:55 +0000
+++ data/window-stack-bridge.conf.in 2014-09-15 15:53:34 +0000
@@ -3,13 +3,4 @@
3start on started dbus3start on started dbus
4stop on desktop-end4stop on desktop-end
55
6pre-start script
7 if [ -z $DBUS_SESSION_BUS_ADDRESS ]; then
8 echo "Working around missing DBUS_SESSION_BUS_ADDRESS variable"
9 printf "DuplicateSignature\0DBusSessionAddressNotSet" | /usr/share/apport/recoverable_problem -p `pidof -s -o 1 init`
10 . "${HOME}/.cache/upstart/dbus-session"
11 initctl set-env "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
12 fi
13end script
14
15exec @pkglibexecdir@/window-stack-bridge6exec @pkglibexecdir@/window-stack-bridge

Subscribers

People subscribed via source and target branches