Merge lp:~mjblenner/whoopsie/whoopsie into lp:whoopsie

Proposed by Michael Blennerhassett
Status: Needs review
Proposed branch: lp:~mjblenner/whoopsie/whoopsie
Merge into: lp:whoopsie
Diff against target: 12 lines (+1/-1)
1 file modified
data/whoopsie.conf (+1/-1)
To merge this branch: bzr merge lp:~mjblenner/whoopsie/whoopsie
Reviewer Review Type Date Requested Status
Didier Roche Approve
Brian Murray Pending
Daisy Pluckers Pending
Review via email: mp+252199@code.launchpad.net

Description of the change

Set the WAIT_STATE to get wait-for-state to do something useful. GOAL is also not needed.

To post a comment you must log in.
Revision history for this message
Didier Roche (didrocks) wrote :

Hey, thanks for the fix under upstart (I did the real fix that was discussed on the bug though), but I added your upstart job in the same upload as well (0.2.47).

However, I can't merge into the upstream branch, so just letting my approval stamp here. Brian should merge back the upload to trunk as he has commit access :)

Thanks again!

review: Approve

Unmerged revisions

663. By Michael Blennerhassett

Set the WAIT_STATE to get the desired effect.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/whoopsie.conf'
2--- data/whoopsie.conf 2014-11-06 12:30:06 +0000
3+++ data/whoopsie.conf 2015-03-07 08:22:38 +0000
4@@ -12,7 +12,7 @@
5 pre-start script
6
7 # Wait for network-manager if and only if it's installed.
8- status network-manager >/dev/null 2>&1 && start wait-for-state WAITER=whoopsie WAIT_FOR=network-manager GOAL=start || :
9+ status network-manager >/dev/null 2>&1 && start wait-for-state WAITER=whoopsie WAIT_FOR=network-manager WAIT_STATE=running || :
10 end script
11
12 exec whoopsie -f

Subscribers

People subscribed via source and target branches

to status/vote changes: