From: vsr <vsr@opencascade.com>
Date: Wed, 31 Jul 2013 14:20:13 +0000 (+0000)
Subject: [CEA 900] Regression: on test glue_performance.py
X-Git-Tag: begin_agr_portmanager_branch_131004~67
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a6cdfe5ec4649d7dde6a06f5869bf6e33216fe15;p=modules%2Fkernel.git

[CEA 900] Regression: on test glue_performance.py
Fix problem with missing env variable OMNIORB_USER_PATH.
---

diff --git a/bin/runSalome.py b/bin/runSalome.py
index 44a9693da..7e3d62634 100755
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -802,6 +802,18 @@ def no_main():
 
 def main():
     """Salome launch as a main application"""
+
+    ### TEMP >>> ###
+    if not os.getenv("OMNIORB_USER_PATH"):
+        homePath = os.path.realpath(os.path.expanduser('~'))
+        #defaultOmniorbUserPath = os.path.join(homePath, ".salomeConfig/USERS")
+        defaultOmniorbUserPath = homePath
+        if os.getenv("APPLI"):
+            defaultOmniorbUserPath = os.path.join(homePath, os.getenv("APPLI"), "USERS")
+        os.environ["OMNIORB_USER_PATH"] = defaultOmniorbUserPath
+        pass
+    ### <<< TEMP ###
+
     from salome_utils import getHostName
     print "runSalome running on %s" % getHostName()
     args, modules_list, modules_root_dir = setenv.get_config()
@@ -921,16 +933,5 @@ def runSalome():
 # -----------------------------------------------------------------------------
 
 if __name__ == "__main__":
-
-    ### TEMP ###
-    homePath = os.path.realpath(os.path.expanduser('~'))
-    #defaultOmniorbUserPath = os.path.join(homePath, ".salomeConfig/USERS")
-    appli = os.getenv("APPLI")
-    defaultOmniorbUserPath = homePath
-    if appli:
-        defaultOmniorbUserPath = os.path.join( homePath, appli, "USERS" )
-    os.environ["OMNIORB_USER_PATH"] = defaultOmniorbUserPath
-    ############
-
     runSalome()
 #