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

[Michael Blennerhassett]

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

[Didier Roche-Tolomelli (didrocks)]

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 on 2015-03-07

Set the WAIT_STATE to get the desired effect.

=== modified file 'data/whoopsie.conf'
--- data/whoopsie.conf	2014-11-06 12:30:06 +0000
+++ data/whoopsie.conf	2015-03-07 08:22:38 +0000
@@ -12,7 +12,7 @@
 pre-start script
 
     # Wait for network-manager if and only if it's installed.
-    status network-manager >/dev/null 2>&1 && start wait-for-state WAITER=whoopsie WAIT_FOR=network-manager GOAL=start || :
+    status network-manager >/dev/null 2>&1 && start wait-for-state WAITER=whoopsie WAIT_FOR=network-manager WAIT_STATE=running || :
 end script
 
 exec whoopsie -f