CMake: fixed minor bug: when a _ROOT_DIR variable was set by the user after

[modules/kernel.git] / bin / runSalome.py

diff --git a/bin/runSalome.py b/bin/runSalome.py
index df7b7b0c6de345d4e429ced9af0d4f835ba3cdaf..63652278c9a33a36031b3595c40e01dcdacc5867 100755 (executable)
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -764,7 +764,7 @@ def useSalome(args, modules_list, modules_root_dir):
                 if not args['gui'] or not args['session_gui']:
                     toimport = args['pyscript']
 
-        from salomeLauncherUtils import formatScriptsAndArgs
+        from salomeContextUtils import formatScriptsAndArgs
         command = formatScriptsAndArgs(toimport)
         if command:
             proc = subprocess.Popen(command, shell=True)
@@ -812,9 +812,9 @@ def no_main():
     searchFreePort(args, 0)
     clt = useSalome(args, modules_list, modules_root_dir)
 
-    if args.has_key('shutdown_servers') : 
+    if args.has_key('shutdown_servers') :
         var = args['shutdown_servers']
-        if hasattr(var, 'delete') and callable(getattr(var, 'delete')) : 
+        if hasattr(var, 'delete') and callable(getattr(var, 'delete')) :
             var.delete()
     return clt
 
@@ -825,15 +825,15 @@ def main():
 
     # define folder to store omniorb config (initially in virtual application folder)
     try:
-        from salomeLauncherUtils import setOmniOrbUserPath
+        from salomeContextUtils import setOmniOrbUserPath
         setOmniOrbUserPath()
     except Exception, e:
         print e
         sys.exit(1)
 
     from salome_utils import getHostName
-    print "runSalome running on %s" % getHostName()
     args, modules_list, modules_root_dir = setenv.get_config()
+    print "runSalome running on %s" % getHostName()
 
     kill_salome(args)
     save_config = True
@@ -944,9 +944,9 @@ def runSalome():
         foreGround(clt, args)
         pass
     # --
-    if args.has_key('shutdown_servers') : 
+    if args.has_key('shutdown_servers') :
         var = args['shutdown_servers']
-        if hasattr(var, 'delete') and callable(getattr(var, 'delete')) : 
+        if hasattr(var, 'delete') and callable(getattr(var, 'delete')) :
             var.delete()
     pass
 #