Fix bashism in tools/run-test-dbus-session.sh

3 files changed, 23 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index bb147a0f..3a8e687a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ network-manager (1.1.91-1) UNRELEASED; urgency=medium
     the dnsmasq local caching nameserver config.
   * Ship /etc/NetworkManager/dnsmasq-shared.d/ directory which can be used to
     extend the dnsmasq configuration for shared connections.
+  * Fix bashism in tools/run-test-dbus-session.sh.
 
  -- Michael Biebl <biebl@debian.org>  Tue, 01 Mar 2016 16:56:21 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 445a1b3d..85bedbaa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ Check-at-runtime-whether-to-start-ModemManager.patch
 Don-t-make-NetworkManager-D-Bus-activatable.patch
 Don-t-block-network.target-on-NetworkManager-wait-on.patch
 Fix-iscsiadm-path.patch
+tests-fix-bashism-in-run-test-dbus-session.sh.patch
diff --git a/debian/patches/tests-fix-bashism-in-run-test-dbus-session.sh.patch b/debian/patches/tests-fix-bashism-in-run-test-dbus-session.sh.patch
new file mode 100644
index 00000000..c18251f1
--- /dev/null
+++ b/debian/patches/tests-fix-bashism-in-run-test-dbus-session.sh.patch
@@ -0,0 +1,21 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Tue, 1 Mar 2016 19:43:44 +0100
+Subject: tests: fix bashism in run-test-dbus-session.sh
+
+https://bugzilla.gnome.org/show_bug.cgi?id=762940
+---
+ tools/run-test-dbus-session.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/run-test-dbus-session.sh b/tools/run-test-dbus-session.sh
+index 0235d65..c6a94fa 100755
+--- a/tools/run-test-dbus-session.sh
++++ b/tools/run-test-dbus-session.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-if ! which dbus-run-session &>/dev/null; then
++if ! which dbus-run-session >/dev/null 2>&1; then
+     eval `dbus-launch --sh-syntax`
+     trap "kill $DBUS_SESSION_BUS_PID" EXIT
+     "$@"