diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-04 16:47:20 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-04 12:19:39 +0100 |
| commit | c8a6b9edd819c48148e70a52cb4b6fdd5de96d75 (patch) | |
| tree | b2f9206b292ee0e75d3461718c97bb3154136cc5 | |
| parent | 54ff4b44fb9cad660df9732cabff04ecc34729ca (diff) | |
| download | telepathy-haze-c8a6b9edd819c48148e70a52cb4b6fdd5de96d75.tar.gz | |
Sync with-session-bus.sh from telepathy-glib master
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=63119
| -rw-r--r-- | tools/with-session-bus.sh | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/tools/with-session-bus.sh b/tools/with-session-bus.sh index 063bd7e..0afa593 100644 --- a/tools/with-session-bus.sh +++ b/tools/with-session-bus.sh @@ -59,7 +59,9 @@ cleanup () { pid=`head -n1 $me-$$.pid` if test -n "$pid" ; then - echo "Killing temporary bus daemon: $pid" >&2 + if [ -n "$VERBOSE_TESTS" ]; then + echo "Killing temporary bus daemon: $pid" >&2 + fi kill -INT "$pid" fi rm -f $me-$$.address @@ -69,12 +71,22 @@ cleanup () trap cleanup INT HUP TERM dbus-daemon $dbus_daemon_args -{ echo -n "Temporary bus daemon is "; cat $me-$$.address; } >&2 -{ echo -n "Temporary bus daemon PID is "; head -n1 $me-$$.pid; } >&2 +if [ -n "$VERBOSE_TESTS" ]; then + { echo -n "Temporary bus daemon is "; cat $me-$$.address; } >&2 + { echo -n "Temporary bus daemon PID is "; head -n1 $me-$$.pid; } >&2 +fi e=0 + +# These might be non-null when run from e.g. gnome-terminal 3.8, which uses +# an activatable service for its windows; we don't want to inherit them either +unset DBUS_STARTER_ADDRESS +unset DBUS_STARTER_BUS_TYPE + DBUS_SESSION_BUS_ADDRESS="`cat $me-$$.address`" export DBUS_SESSION_BUS_ADDRESS +DBUS_SESSION_BUS_PID="`cat $me-$$.pid`" +export DBUS_SESSION_BUS_PID if [ -n "$WITH_SESSION_BUS_FORK_DBUS_MONITOR" ] ; then echo -n "Forking dbus-monitor $WITH_SESSION_BUS_FORK_DBUS_MONITOR_OPT" >&2 |