Merge lp:~3v1n0/bamf/safer-dbus-runner into lp:bamf

[Marco Trevisan (Treviño)]

bamfdaemon-dbus-runner: don't try to start again if already running

Might be related to lp:1532226

[Andrea Azzarone (azzar1)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:635
http://jenkins.qa.ubuntu.com/job/bamf-ci/136/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-xenial-amd64-ci/17
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/bamf-xenial-armhf-ci/17/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'data/bamfdaemon-dbus-runner.in'
--- data/bamfdaemon-dbus-runner.in	2015-11-19 09:44:40 +0000
+++ data/bamfdaemon-dbus-runner.in	2016-04-28 09:52:22 +0000
@@ -1,7 +1,11 @@
 #!/bin/bash
 
 if [ -n "$UPSTART_SESSION" ]; then
-  /sbin/initctl start bamfdaemon
+  if ! (initctl status bamfdaemon | grep -q start); then
+    /sbin/initctl start bamfdaemon
+  else
+    echo "bamfdaemon job is already running..."
+  fi
 else
   @PKGLIBEXECDIR@/bamfdaemon
 fi