Merge from V6_3_BR 19/07/2011

[modules/kernel.git] / bin / killSalomeWithPort.py

diff --git a/bin/killSalomeWithPort.py b/bin/killSalomeWithPort.py
index 99c092c1f935aff78a5181a702492be97599b721..bcc1480044247551491ab4c1dc1c668b3948643d 100755 (executable)
--- a/bin/killSalomeWithPort.py
+++ b/bin/killSalomeWithPort.py
@@ -208,7 +208,7 @@ def killMyPort(port):
                     try:
                         if sys.platform == "win32":
                             import win32pm
-                            win32pm.killpid(int(pid),0)
+                            win32pm.killpid(int(pid),0)                            
                         else:
                             os.kill(int(pid),signal.SIGKILL)
                             pass
@@ -265,13 +265,19 @@ def killNotifdAndClean(port):
 def killMyPortSpy(pid, port):
     dt = 1.0
     while 1:
-        from os import kill
-        try:
-            kill(int(pid), 0)
-        except OSError, e:
-            if e.errno != 3:
+        if sys.platform == "win32":
+            from win32pm import killpid
+            if killpid(int(pid), 0) != 0:
                 return
-            break
+        else:
+            from os import kill
+            try:
+                kill(int(pid), 0)
+            except OSError, e:
+                if e.errno != 3:
+                    return
+                break
+            pass
         from time import sleep
         sleep(dt)
         pass