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:
a4f1d4d
)
Recover previously removed line
author
Gilles DAVID
<gilles-g.david@edf.fr>
Mon, 24 Nov 2014 16:41:50 +0000
(17:41 +0100)
committer
Cédric Aguerre
<cedric.aguerre@edf.fr>
Mon, 1 Dec 2014 13:38:05 +0000
(14:38 +0100)
The previously removed "import" command is specifically tested in
the try except block.
bin/killSalomeWithPort.py
patch
|
blob
|
history
diff --git
a/bin/killSalomeWithPort.py
b/bin/killSalomeWithPort.py
index 0ffb397e3168e38b39cbba92c25ae2f1f04a274a..e6dcf5d375e8cefb84c688a8262e7f63e9807b57 100755
(executable)
--- a/
bin/killSalomeWithPort.py
+++ b/
bin/killSalomeWithPort.py
@@
-378,6
+378,7
@@
def killMyPort(port):
time.sleep(3) # wait a little, then kill processes (should be done if shutdown procedure hangs up)
try:
time.sleep(3) # wait a little, then kill processes (should be done if shutdown procedure hangs up)
try:
+ import PortManager
filedict = getPiDict(port)
#filedict = __guessPiDictFilename(port)
import glob
filedict = getPiDict(port)
#filedict = __guessPiDictFilename(port)
import glob