[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone5.1

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit ac364a3394f21ce8e3740b767f4d416b411460e6
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Thu Feb 12 00:08:30 2009 +0100

    ogsmd: wrap os.kill in try/except as the process might have vanished on its own in the meantime.

diff --git a/framework/patterns/processguard.py b/framework/patterns/processguard.py
index b8661a0..665e823 100644
--- a/framework/patterns/processguard.py
+++ b/framework/patterns/processguard.py
@@ -10,7 +10,7 @@ Package: framework.patterns
 Module: processguard
 """
 
-__version__ = "0.2.1"
+__version__ = "0.2.2"
 
 import gobject
 
@@ -149,7 +149,10 @@ class ProcessGuard( object ):
         """
         if self.pid is not None:
             logger.info( "shutdown: killing process %d with signal %d", self.pid, sig )
-            os.kill( self.pid, sig )
+            try:
+                os.kill( self.pid, sig )
+            except OSError:
+                logger.info( "shutdown: process already vanished" )
         else:
             logger.info( "shutdown: process already vanished" )
 

-- 
FSO frameworkd Debian packaging