Unity HUD

Merge lp:~ogra/hud/new-dbus-address into lp:hud/14.04

  1. new-dbus-address
  2. Merge into trunk.14.04
Proposed by Oliver Grawert
Status: Superseded
Proposed branch: lp:~ogra/hud/new-dbus-address
Merge into: lp:hud/14.04
Diff against target: 57 lines (+9/-13)
3 files modified
data/hud.conf.in (+1/-12)
data/window-stack-bridge.conf.in (+1/-1)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~ogra/hud/new-dbus-address
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+220066@code.launchpad.net

This proposal has been superseded by a proposal from 2014-06-13.

Commit message

move to new dbus-session address handling in XDG_RUNTIME_DIR

Description of the change

move to new dbus-session address handling in XDG_RUNTIME_DIR (needs https://code.launchpad.net/~ogra/ubuntu-touch-session/fix-dbus-location/+merge/220064)

To post a comment you must log in.
Revision history for this message
Oliver Grawert (ogra) wrote :

needs also http://paste.ubuntu.com/7488802/ to land at the same time

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

PASSED: Continuous integration, rev:392
http://jenkins.qa.ubuntu.com/job/hud-ci/286/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-utopic-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-utopic-i386-ci/1

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

review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) wrote :

I think that we still need to report the recoverable error here as it isn't entirely fixed:

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

review: Needs Fixing
Revision history for this message
Oliver Grawert (ogra) wrote :

well, this isn't any kind of fix for that session bus address issue but in conjunction with the other branches and the pending dbus upload a fix for a critical bug leaving you with a completely unbootable phone if the homedir is 100% filled ... please see bug 1316978, i will open a HUD task for it...

Revision history for this message
Ted Gould (ted) wrote :

On Mon, 2014-05-19 at 19:01 +0000, Oliver Grawert wrote:

> well, this isn't any kind of fix for that session bus address issue
> but in conjunction with the other branches and the pending dbus upload
> a fix for a critical bug leaving you with a completely unbootable
> phone if the homedir is 100% filled ... please see bug 1316978, i will
> open a HUD task for it...

Not expecting this to fix it, but you're removing the reporting of it
which is done in that pre-start script.

Revision history for this message
Oliver Grawert (ogra) wrote :

erm, did you look at the current upstart job ? it is completely broken containing two identical pre-start script blocks, i am just remooving the duplication.

Revision history for this message
Ted Gould (ted) wrote :

On Mon, 2014-05-19 at 21:15 +0000, Oliver Grawert wrote:

> erm, did you look at the current upstart job ? it is completely broken containing two identical pre-start script blocks, i am just remooving the duplication.

Uhg, sorry, no. Just looked at the diff. Not sure how that happened.

Revision history for this message
Ted Gould (ted) :
review: Approve

Unmerged revisions

392. By Oliver Grawert

fix duplicated pre-start script blocks in upstart jobs, make sure to use dbus-session address from new location

391. By Ricardo Salveti

releasing package hud version 13.10.1+14.04.20140402-0ubuntu2

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 2013-11-27 14:28:43 +0000
+++ data/hud.conf.in 2014-05-19 14:37:48 +0000
@@ -1,16 +1,5 @@
1description "Unity HUD"1description "Unity HUD"
22
3pre-start script
4 if [ -z $DBUS_SESSION_BUS_ADDRESS ]; then
5 echo "Working around missing DBUS_SESSION_BUS_ADDRESS variable"
6 printf "DuplicateSignature\0DBusSessionAddressNotSet" | /usr/share/apport/recoverable_problem -p `pidof -s -o 1 init`
7 . "${HOME}/.cache/upstart/dbus-session"
8 initctl set-env "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
9 fi
10end script
11
12# Currently started by the dbus service file
13# start on dbus-activation com.canonical.hud
14stop on desktop-end3stop on desktop-end
15start on started dbus and ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger) or (xsession SESSION=ubuntu))4start on started dbus and ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger) or (xsession SESSION=ubuntu))
165
@@ -21,7 +10,7 @@
21 if [ -z $DBUS_SESSION_BUS_ADDRESS ]; then10 if [ -z $DBUS_SESSION_BUS_ADDRESS ]; then
22 echo "Working around missing DBUS_SESSION_BUS_ADDRESS variable"11 echo "Working around missing DBUS_SESSION_BUS_ADDRESS variable"
23 printf "DuplicateSignature\0DBusSessionAddressNotSet" | /usr/share/apport/recoverable_problem -p `pidof -s -o 1 init`12 printf "DuplicateSignature\0DBusSessionAddressNotSet" | /usr/share/apport/recoverable_problem -p `pidof -s -o 1 init`
24 . "${HOME}/.cache/upstart/dbus-session"13 . "$XDG_RUNTIME_DIR/dbus-session"
25 initctl set-env "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"14 initctl set-env "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
26 fi15 fi
27end script16end script
2817
=== 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-05-19 14:37:48 +0000
@@ -7,7 +7,7 @@
7 if [ -z $DBUS_SESSION_BUS_ADDRESS ]; then7 if [ -z $DBUS_SESSION_BUS_ADDRESS ]; then
8 echo "Working around missing DBUS_SESSION_BUS_ADDRESS variable"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` 9 printf "DuplicateSignature\0DBusSessionAddressNotSet" | /usr/share/apport/recoverable_problem -p `pidof -s -o 1 init`
10 . "${HOME}/.cache/upstart/dbus-session"10 . "$XDG_RUNTIME_DIR/dbus-session"
11 initctl set-env "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"11 initctl set-env "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
12 fi12 fi
13end script13end script
1414
=== modified file 'debian/changelog'
--- debian/changelog 2014-04-29 16:39:14 +0000
+++ debian/changelog 2014-05-19 14:37:48 +0000
@@ -1,3 +1,10 @@
1hud (13.10.1+14.04.20140519-0ubuntu1) UNRELEASED; urgency=medium
2
3 * fix duplicated pre-start blocks in upstart jobs
4 * make sure we use dbus address from /run/user/$USER
5
6 -- Oliver Grawert <ogra@ubuntu.com> Mon, 19 May 2014 16:30:07 +0200
7
1hud (13.10.1+14.04.20140402-0ubuntu2) utopic; urgency=medium8hud (13.10.1+14.04.20140402-0ubuntu2) utopic; urgency=medium
29
3 * No-change rebuild for shlib changes in qtbase and qtdeclarative.10 * No-change rebuild for shlib changes in qtbase and qtdeclarative.

Subscribers

People subscribed via source and target branches