make stopping the launch manager more robust to errors

osrf · May 14, 2014 · 02fca5e · 02fca5e
1 parent 9eae349
commit 02fca5e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/capabilities/launch_manager.py b/src/capabilities/launch_manager.py
@@ -114,8 +114,12 @@ def stop(self):
             if self.stopping:
                 return  # pragma: no cover
             self.stopping = True
-            for pid in self.__running_launch_files:
-                self.__stop_by_pid(pid)  # pragma: no cover
+            for pid in self.__running_launch_files:  # pragma: no cover
+                try:
+                    self.__stop_by_pid(pid)
+                except RuntimeError as exc:
+                    if "launch file with PID" not in "{0}".format(exc):
+                        raise  # Re-raise
 
     def __stop_by_pid(self, pid):
         if pid not in self.__running_launch_files: