Unity HUD

Merge lp:~ted/hud/fix-hud-activation into lp:hud/13.10

  1. fix-hud-activation
  2. Merge into trunk.13.10
Proposed by Ted Gould
Status: Merged
Approved by: Ted Gould
Approved revision: 329
Merged at revision: 326
Proposed branch: lp:~ted/hud/fix-hud-activation
Merge into: lp:hud/13.10
Diff against target: 18 lines (+9/-1)
1 file modified
data/hud.conf.in (+9/-1)
To merge this branch: bzr merge lp:~ted/hud/fix-hud-activation
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Pete Woods (community) Approve
Review via email: mp+189869@code.launchpad.net

Commit message

Working around the missing session bus variable and reporting a bug

Description of the change

This builds on Pete's branch where no we're only doing it if the variable isn't set, and we're reporting a recoverable error to ensure that it get tracked.

To post a comment you must log in.
Revision history for this message
Pete Woods (pete-woods) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/hud-autolanding/81/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-saucy-amd64-autolanding/64/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-armhf-autolanding/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-i386-autolanding/64

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:329
http://jenkins.qa.ubuntu.com/job/hud-ci/130/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-amd64-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-armhf-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-i386-ci/91

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/hud-ci/130/rebuild

review: Approve (continuous-integration)

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 2013-06-11 14:30:16 +0000
3+++ data/hud.conf.in 2013-10-08 14:43:10 +0000
4@@ -1,5 +1,13 @@
5 description "Unity HUD"
6-author "Ted Gould <ted@ubuntu.com>"
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 # Currently started by the dbus service file
18 # start on dbus-activation com.canonical.hud

Subscribers

People subscribed via source and target branches