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

Proposed by Marco Trevisan (Treviño) on 2016-04-28
Status: Merged
Approved by: Andrea Azzarone on 2016-04-28
Approved revision: 635
Merged at revision: 635
Proposed branch: lp:~3v1n0/bamf/safer-dbus-runner
Merge into: lp:bamf
Diff against target: 16 lines (+5/-1)
1 file modified
data/bamfdaemon-dbus-runner.in (+5/-1)
To merge this branch: bzr merge lp:~3v1n0/bamf/safer-dbus-runner
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2016-04-28
Andrea Azzarone 2016-04-28 Approve on 2016-04-28
Review via email: mp+293229@code.launchpad.net

Commit message

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

Description of the change

Might be related to lp:1532226

To post a comment you must log in.
Andrea Azzarone (azzar1) wrote :

+1

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/bamfdaemon-dbus-runner.in'
2--- data/bamfdaemon-dbus-runner.in 2015-11-19 09:44:40 +0000
3+++ data/bamfdaemon-dbus-runner.in 2016-04-28 09:52:22 +0000
4@@ -1,7 +1,11 @@
5 #!/bin/bash
6
7 if [ -n "$UPSTART_SESSION" ]; then
8- /sbin/initctl start bamfdaemon
9+ if ! (initctl status bamfdaemon | grep -q start); then
10+ /sbin/initctl start bamfdaemon
11+ else
12+ echo "bamfdaemon job is already running..."
13+ fi
14 else
15 @PKGLIBEXECDIR@/bamfdaemon
16 fi

Subscribers

People subscribed via source and target branches