From: caremoli <caremoli>
Date: Fri, 21 Jan 2011 16:06:44 +0000 (+0000)
Subject: CCAR: change the hostname used for pidict file on remote machines (os.getenv["NSHOST... 
X-Git-Tag: Start_BR_19998_21191~95
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a1fdd2e153fabd7d8f617483e6cb9538f1ea0685;p=modules%2Fkernel.git

CCAR: change the hostname used for pidict file on remote machines (os.getenv["NSHOST"] instead of local hostname).
---

diff --git a/bin/killSalomeWithPort.py b/bin/killSalomeWithPort.py
index a1744675d..9973ec49b 100755
--- a/bin/killSalomeWithPort.py
+++ b/bin/killSalomeWithPort.py
@@ -71,7 +71,7 @@ def getPiDict(port,appname='salome',full=True,hidden=True):
                             suffix="pidict",
                             hidden=hidden,
                             with_username=True,
-                            with_hostname=True,
+                            with_hostname=os.getenv("NSHOST") or True,
                             with_port=port,
                             with_app=appname.upper())
 
@@ -113,6 +113,8 @@ def appliCleanOmniOrbConfig(port):
             os.remove(omniorb_config)
             pass
 
+        if os.path.lexists(last_running_config):return 
+
         #try to relink last.cfg to an existing config file if any
         files = glob.glob(os.path.join(os.environ["HOME"],Utils_Identity.getapplipath(),
                                        "USERS",".omniORB_"+salome_utils.getUserName()+"_*.cfg"))