Better fix for salome kill (issue CEA 17744).

diff --git a/bin/killSalomeWithPort.py b/bin/killSalomeWithPort.py
index 7417f18994125fa94ed2edf0949a6ceda94925e5..6fc8bae13cd38d3b3f0be652df7cef328c03831e 100755 (executable)
--- a/bin/killSalomeWithPort.py
+++ b/bin/killSalomeWithPort.py
@@ -208,9 +208,14 @@ def shutdownMyPort(port, cleanup=True):
         time.sleep(1)
         # shutdown omniNames
         if cleanup:
-            lcc.killOmniNames()
-            time.sleep(1)
-            pass
+          from salome_utils import killOmniNames
+          killOmniNames(port)
+          filedict=getPiDict(port)
+          __killMyPort(port, filedict)
+          from PortManager import releasePort
+          releasePort(port)
+          time.sleep(1)
+          pass
         pass
     except:
         pass
@@ -342,7 +347,7 @@ def cleanApplication(port):
 
     try:
         filedict=getPiDict(port)
-        __killMyPort(port, filedict)
+        os.remove(filedict)
     except:
       #import traceback
       #traceback.print_exc()