From f4ddafec7f55eed226a3aec159102cac81f7d57e Mon Sep 17 00:00:00 2001 From: Ovidiu Mircescu Date: Mon, 7 Oct 2019 15:21:30 +0200 Subject: [PATCH] Better fix for salome kill (issue CEA 17744). --- bin/killSalomeWithPort.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/bin/killSalomeWithPort.py b/bin/killSalomeWithPort.py index 7417f1899..6fc8bae13 100755 --- 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() -- 2.39.2