Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
EDF bug 17743, salome.sg regressions in DEV (missing getAllSelected method)
[modules/kernel.git]
/
bin
/
killSalomeWithPort.py
diff --git
a/bin/killSalomeWithPort.py
b/bin/killSalomeWithPort.py
index f18052e4120caa998536d6d6b01d3b3f2c75c199..fec9e4aa356850f7a1794f4bc39e881283a9febf 100755
(executable)
--- a/
bin/killSalomeWithPort.py
+++ b/
bin/killSalomeWithPort.py
@@
-1,6
+1,6
@@
-#! /usr/bin/env python
+#! /usr/bin/env python
3
# -*- coding: iso-8859-1 -*-
# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-201
7
CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-214,12
+214,12
@@
def shutdownMyPort(port, cleanup=True):
pass
except:
pass
pass
except:
pass
- exit(0) # see (1)
+
sys.
exit(0) # see (1)
pass
# (1) If --shutdown-servers option is set to 1, session close procedure is
pass
# (1) If --shutdown-servers option is set to 1, session close procedure is
-# called twice: first explicit
e
ly by salome command, second by automatic
+# called twice: first explicitly by salome command, second by automatic
# atexit to handle Ctrl-C. During second call, LCC does not exist anymore and
# atexit to handle Ctrl-C. During second call, LCC does not exist anymore and
-# a RuntimeError is raised; we explicit
e
ly exit this function with code 0 to
+# a RuntimeError is raised; we explicitly exit this function with code 0 to
# prevent parent thread from crashing.
def __killMyPort(port, filedict):
# prevent parent thread from crashing.
def __killMyPort(port, filedict):
@@
-228,7
+228,7
@@
def __killMyPort(port, filedict):
port = int(port)
try:
port = int(port)
try:
- with open(filedict, 'r') as fpid:
+ with open(filedict, 'r
b
') as fpid:
process_ids=pickle.load(fpid)
for process_id in process_ids:
for pid, cmd in list(process_id.items()):
process_ids=pickle.load(fpid)
for process_id in process_ids:
for pid, cmd in list(process_id.items()):