Salome HOME
projects
/
modules
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
db9b47d
)
Better fix for salome kill (issue CEA 17744).
V9_4_0a2
V9_4_0b1
author
Ovidiu Mircescu
<ovidiu.mircescu@edf.fr>
Mon, 7 Oct 2019 13:21:30 +0000
(15:21 +0200)
committer
Ovidiu Mircescu
<ovidiu.mircescu@edf.fr>
Mon, 7 Oct 2019 13:21:30 +0000
(15:21 +0200)
bin/killSalomeWithPort.py
patch
|
blob
|
history
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()