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

[Pete Woods]

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)

[Oliver Grawert (ogra)]

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

[PS Jenkins bot (ps-jenkins)]

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)

[Ted Gould (ted)]

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

[Oliver Grawert (ogra)]

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...

[Ted Gould (ted)]

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.

[Oliver Grawert (ogra)]

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.

[Ted Gould (ted)]

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.

[Ted Gould (ted)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:392
http://jenkins.qa.ubuntu.com/job/hud-ci/290/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-utopic-amd64-ci/5
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-utopic-armhf-ci/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-utopic-i386-ci/5

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

392. By Oliver Grawert on 2014-05-19

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

=== modified file 'data/hud.conf.in'
--- data/hud.conf.in	2013-11-27 14:28:43 +0000
+++ data/hud.conf.in	2014-06-13 07:39:06 +0000
@@ -1,16 +1,5 @@
 description "Unity HUD"
 
-pre-start script
-	if [ -z $DBUS_SESSION_BUS_ADDRESS ]; then
-		echo "Working around missing DBUS_SESSION_BUS_ADDRESS variable"
-		printf "DuplicateSignature\0DBusSessionAddressNotSet" | /usr/share/apport/recoverable_problem -p `pidof -s -o 1 init`
-		. "${HOME}/.cache/upstart/dbus-session"
-		initctl set-env "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
-	fi
-end script
-
-# Currently started by the dbus service file
-# start on dbus-activation com.canonical.hud
 stop on desktop-end
 start on started dbus and ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger) or (xsession SESSION=ubuntu))
 
@@ -21,7 +10,7 @@
 	if [ -z $DBUS_SESSION_BUS_ADDRESS ]; then
 		echo "Working around missing DBUS_SESSION_BUS_ADDRESS variable"
 		printf "DuplicateSignature\0DBusSessionAddressNotSet" | /usr/share/apport/recoverable_problem -p `pidof -s -o 1 init`
-		. "${HOME}/.cache/upstart/dbus-session"
+		. "$XDG_RUNTIME_DIR/dbus-session"
 		initctl set-env "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
 	fi
 end script

=== 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-06-13 07:39:06 +0000
@@ -7,7 +7,7 @@
         if [ -z $DBUS_SESSION_BUS_ADDRESS ]; then
                 echo "Working around missing DBUS_SESSION_BUS_ADDRESS variable"
                 printf "DuplicateSignature\0DBusSessionAddressNotSet" | /usr/share/apport/recoverable_problem -p `pidof -s -o 1 init` 
-                . "${HOME}/.cache/upstart/dbus-session"
+                . "$XDG_RUNTIME_DIR/dbus-session"
                 initctl set-env "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
         fi
 end script

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-09 14:06:31 +0000
+++ debian/changelog	2014-06-13 07:39:06 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 hud (13.10.1+14.10.20140609-0ubuntu1) utopic; urgency=low
 
   [ Ubuntu daily release ]
@@ -8,6 +9,15 @@
 
  -- Ubuntu daily release <[e-mail]>  Mon, 09 Jun 2014 14:06:31 +0000
 
+=======
+hud (13.10.1+14.04.20140519-0ubuntu1) UNRELEASED; urgency=medium
+
+  * fix duplicated pre-start blocks in upstart jobs
+  * make sure we use dbus address from /run/user/$USER
+
+ -- Oliver Grawert <[e-mail]>  Mon, 19 May 2014 16:30:07 +0200
+
+>>>>>>> MERGE-SOURCE
 hud (13.10.1+14.04.20140402-0ubuntu2) utopic; urgency=medium
 
   * No-change rebuild for shlib changes in qtbase and qtdeclarative.