]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
Fix bug preventing SALOME applications without GUI to launch properly rbe/fix-appli-wo-gui
authorRenaud Barate <renaud.barate@edf.fr>
Mon, 5 Jan 2015 10:31:27 +0000 (11:31 +0100)
committerRenaud Barate <renaud.barate@edf.fr>
Mon, 5 Jan 2015 10:31:27 +0000 (11:31 +0100)
This bug was introduced by commit 33045b958bf590997b2765a5f0a17c2139d92b92

bin/launchConfigureParser.py

index 51a1974045e17529251bb96200ec51b48baa7000..99db4a7cd4f4de5f6d16c34616535e44bc8a594f 100755 (executable)
@@ -941,13 +941,14 @@ def get_env(theAdditionalOptions=None, appname=salomeappname, cfgname=salomecfgn
         else:
             dirs += re.split('[;|:]', os.getenv(config_var))
 
-    gui_available = True
-    gui_resources_dir = os.path.join(os.getenv("GUI_ROOT_DIR"),'share','salome','resources','gui')
-    if os.getenv("GUI_ROOT_DIR") and os.path.isdir( gui_resources_dir ):
-        dirs.append(gui_resources_dir)
+    gui_available = False
+    if os.getenv("GUI_ROOT_DIR"):
+        gui_resources_dir = os.path.join(os.getenv("GUI_ROOT_DIR"),'share','salome','resources','gui')
+        if os.path.isdir( gui_resources_dir ):
+            gui_available = True
+            dirs.append(gui_resources_dir)
         pass
-    else:
-        gui_available = False
+    if not gui_available:
         kernel_resources_dir = os.path.join(os.getenv("KERNEL_ROOT_DIR"),'bin','salome','appliskel')
         if os.getenv("KERNEL_ROOT_DIR") and os.path.isdir( kernel_resources_dir ):
           dirs.append(kernel_resources_dir)