From 480f3d43c118d838a1ad3a4eeb32109c25f7bc69 Mon Sep 17 00:00:00 2001
From: prascle <prascle>
Date: Mon, 22 Nov 2004 09:49:18 +0000
Subject: [PATCH] PR: problem when runSalome.py is used without args. There is
 still a problem on killSalome whith --xterm: not solved.

---
 bin/runSalome.py | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/bin/runSalome.py b/bin/runSalome.py
index 3ef483331..30e0a0119 100755
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -179,7 +179,7 @@ from killSalome import killAllPorts
 def killLocalPort():
     """
     kill servers from a previous SALOME exection, if needed,
-    on the same CORBA port
+    on the CORBA port given in args of runSalome
     """
     
     from killSalomeWithPort import killMyPort
@@ -191,7 +191,21 @@ def killLocalPort():
         pass
     pass
     
+def givenPortKill(port):
+    """
+    kill servers from a previous SALOME exection, if needed,
+    on the same CORBA port
+    """
     
+    from killSalomeWithPort import killMyPort
+    my_port=port
+    try:
+        killMyPort(my_port)
+    except:
+        print "problem in LocalPortKill(), killMyPort("<<port<<")"
+        pass
+    pass
+
 def kill_salome(args):
     """
     Kill servers from previous SALOME executions, if needed;
@@ -202,7 +216,7 @@ def kill_salome(args):
     if args['killall']:
         killAllPorts()
     elif args['portkill']:
-        killLocalPort()
+        givenPortKill(str(args['port']))
 	
 # -----------------------------------------------------------------------------
 #
@@ -591,8 +605,10 @@ def useSalome(args, modules_list, modules_root_dir):
     To kill SALOME processes from a console (kill all sessions from all ports):
       python killSalome.py 
     To kill SALOME from the present interpreter, if it is not closed :
-      killLocalPort()  --> kill this session
-      killAllPorts()   --> kill all sessions
+      killLocalPort()      --> kill this session
+                               (use CORBA port from args of runSalome)
+      givenPortKill(port)  --> kill a specific session with given CORBA port 
+      killAllPorts()       --> kill all sessions
     
     runSalome, with --killall option, starts with killing
     the processes resulting from the previous execution.
-- 
2.39.2