[telepathy-ashes/master] More robustness for running on korma.

[David Laban]

---
 ashes/tools/echo_daemon.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ashes/tools/echo_daemon.py b/ashes/tools/echo_daemon.py
index c71e8fb..ad6b0b1 100644
--- a/ashes/tools/echo_daemon.py
+++ b/ashes/tools/echo_daemon.py
@@ -37,7 +37,6 @@ import time
 import grp
 import signal
 import daemon
-import lockfile
 import subprocess
 from subprocess import Popen, PIPE, STDOUT, CalledProcessError
 
@@ -106,9 +105,12 @@ def kill_everything():
         try:
             os.kill(process.pid, signal.SIGTERM)
         except OSError:
-            print name, "not killed."
+            print name, "was not killed. Probably already dead."
     if os.environ.get("DBUS_SESSION_BUS_PID", None):
-        os.kill(int(os.environ["DBUS_SESSION_BUS_PID"]),  signal.SIGTERM)
+        try:
+            os.kill(int(os.environ["DBUS_SESSION_BUS_PID"]),  signal.SIGTERM)
+        except OSError:
+            print "dbus was not killed. Probably already dead."
         del os.environ["DBUS_SESSION_BUS_PID"]
 
 def program_cleanup(signum, stack_):
-- 
1.5.6.5