Merge lp:~xnox/update-notifier/wait-for-state into lp:update-notifier/ubuntu

[Dimitri John Ledkov]

[Dimitri John Ledkov (xnox)]

let's not bring in wait-for-state into the mix, and instead start file bridge on started dbus.

Unmerged revisions

823. By Dimitri John Ledkov on 2013-10-03

Wait-for dbus to be running, before reacting to crash filesystem
events. Thus avoiding autolauching dbus ahead of desktop loading, upon
login. (LP: #1234841)

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-02 17:29:35 +0000
+++ debian/changelog	2013-10-03 17:39:04 +0000
@@ -1,8 +1,14 @@
 update-notifier (0.146) UNRELEASED; urgency=low
 
+  [ Brian Murray ]
   * Speed up apt-check (LP: #1233587).  Thanks to Anders Kaseorg for the
     patch.
 
+  [ Dmitrijs Ledkovs ]
+  * Wait-for dbus to be running, before reacting to crash filesystem
+    events. Thus avoiding autolauching dbus ahead of desktop loading, upon
+    login. (LP: #1234841)
+
  -- Brian Murray <[e-mail]>  Wed, 02 Oct 2013 10:27:21 -0700
 
 update-notifier (0.145) saucy; urgency=low

=== modified file 'debian/update-notifier-crash.conf'
--- debian/update-notifier-crash.conf	2013-09-13 15:22:41 +0000
+++ debian/update-notifier-crash.conf	2013-10-03 17:39:04 +0000
@@ -8,6 +8,8 @@
 env MATCH=NULL
 instance $MATCH
 
+pre-start exec start wait-for-state WAIT_FOR=dbus WAITER="$JOB$MATCH" WAIT_STATE=running >/dev/null
+
 script
 DATE=$(date)
 echo "$DATE crash report $MATCH detected"