[Pkg-utopia-maintainers] Bug#681241: dbus-x11: prevent dbus-launch if it is already started

[Martin Pitt]

Hello,

incidentally I just stumbled about this as well. Many display managers
(gdm, lightdm, etc.) already start a session D-BUS, so starting
another one in Xsession.d/ seems redundant. That hasn't normally led
to bugs, but we just encountered a situation (due to wrong startup
ordering, i. e. a bug) where different processes were using different
D-BUSes. I came with conceptually the same patch as Panayiotis. While
this is not by itself a full bug fix, it helps to better debug these
problems and also avoids duplicate bus startup. It's also really cheap
to do.

(Please feel free to reject/close with "wontfix" of course).

Thanks,

Martin

-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
-------------- next part --------------
diff -Nru dbus-1.6.18/debian/changelog dbus-1.6.18/debian/changelog
--- dbus-1.6.18/debian/changelog	2014-05-28 11:39:49.000000000 +0200
+++ dbus-1.6.18/debian/changelog	2014-06-03 10:53:58.000000000 +0200
@@ -1,3 +1,10 @@
+dbus (1.6.18-0ubuntu7) utopic; urgency=medium
+
+  * debian/dbus-Xsession: Don't start a session bus if there already is one,
+    i. e. $DBUS_SESSION_BUS_ADDRESS is already set. (Closes: #681241)
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Tue, 03 Jun 2014 10:39:51 +0200
+
 dbus (1.6.18-0ubuntu6) utopic; urgency=high
 
   * No change rebuild against new dh_installinit, to call update-rc.d at
diff -Nru dbus-1.6.18/debian/dbus-Xsession dbus-1.6.18/debian/dbus-Xsession
--- dbus-1.6.18/debian/dbus-Xsession	2013-11-11 18:07:01.000000000 +0100
+++ dbus-1.6.18/debian/dbus-Xsession	2014-06-03 10:39:45.000000000 +0200
@@ -7,7 +7,7 @@
 DBUSLAUNCH=/usr/bin/dbus-launch
 
 if has_option use-session-dbus; then
-  if [ -x "$DBUSLAUNCH" ]; then
+  if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && [ -x "$DBUSLAUNCH" ]; then
     STARTDBUS=yes
   fi
 fi