[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 9e659baf58f18496cad50caa818f6e5bb54db131
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Fri Feb 13 02:08:09 2009 +0100

    ogsmd: helpers: secure killall against races

diff --git a/framework/subsystems/ogsmd/helpers.py b/framework/subsystems/ogsmd/helpers.py
index 32d6f57..17365ec 100644
--- a/framework/subsystems/ogsmd/helpers.py
+++ b/framework/subsystems/ogsmd/helpers.py
@@ -117,15 +117,15 @@ class BiDict( object ):
 
 #=========================================================================#
 def processIterator():
-#=========================================================================#        
-    for entry in os.listdir( "/proc" ): 
+#=========================================================================#
+    for entry in os.listdir( "/proc" ):
         fileName = os.path.join( "/proc", entry, "cmdline" )
         if os.access( fileName, os.R_OK ):
             cmdline = file( fileName ).read()
             executablePath = cmdline.split("\x00")[0]
             executableName = executablePath.split(os.path.sep)[-1]
             #entry = pid, cmdline = cmdline file contents
-            yield (entry, cmdline, executablePath, executableName) 
+            yield (entry, cmdline, executablePath, executableName)
 
 #=========================================================================#
 def processFinder(nameToFind, matchType):
@@ -148,7 +148,7 @@ def killall( nameToKill, matchType="posix", killSignal=signal.SIGTERM ):
     for pid in processFinder( nameToKill, matchType ):
         try:
             os.kill( pid, killSignal )
-        except OSError: # permission denied/bad signal/etc...
+        except OSError, IOError: # permission denied/bad signal/process vanished/etc...
             pass
         else:
             killedPids.append( pid )

-- 
FSO frameworkd Debian packaging