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
Correction of bug for HPContainers shared by different scripts.
[modules/kernel.git]
/
bin
/
runSalome.py
diff --git
a/bin/runSalome.py
b/bin/runSalome.py
index fa94cbe3ed21599f9e4c390edb64fc0e1e049304..c819b857c8513c044d2a650d8e4e63e69cbf26d6 100755
(executable)
--- a/
bin/runSalome.py
+++ b/
bin/runSalome.py
@@
-725,11
+725,14
@@
def useSalome(args, modules_list, modules_root_dir):
import killSalomeWithPort
self.killSalomeWithPort = killSalomeWithPort
return
import killSalomeWithPort
self.killSalomeWithPort = killSalomeWithPort
return
- def
delete
(self):
+ def
__del__
(self):
self.killSalomeWithPort.killMyPort(self.port)
return
pass
self.killSalomeWithPort.killMyPort(self.port)
return
pass
- args['shutdown_servers'] = __utils__(args['port'])
+ def func(s):
+ del s
+ import atexit
+ atexit.register(func, __utils__(args['port']))
pass
pass
pass
pass
@@
-787,11
+790,6
@@
def no_main():
from searchFreePort import searchFreePort
searchFreePort(args, 0)
clt = useSalome(args, modules_list, modules_root_dir)
from searchFreePort import searchFreePort
searchFreePort(args, 0)
clt = useSalome(args, modules_list, modules_root_dir)
-
- if args.has_key('shutdown_servers') :
- var = args['shutdown_servers']
- if hasattr(var, 'delete') and callable(getattr(var, 'delete')) :
- var.delete()
return clt
# -----------------------------------------------------------------------------
return clt
# -----------------------------------------------------------------------------
@@
-919,11
+917,6
@@
def runSalome():
if test:
foreGround(clt, args)
pass
if test:
foreGround(clt, args)
pass
- # --
- if args.has_key('shutdown_servers') :
- var = args['shutdown_servers']
- if hasattr(var, 'delete') and callable(getattr(var, 'delete')) :
- var.delete()
pass
#
pass
#