From: Renaud Barate <renaud.barate@edf.fr>
Date: Mon, 5 Jan 2015 10:31:27 +0000 (+0100)
Subject: Fix bug preventing SALOME applications without GUI to launch properly
X-Git-Tag: V7_5_1rc1~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Frbe%2Ffix-appli-wo-gui;p=modules%2Fkernel.git

Fix bug preventing SALOME applications without GUI to launch properly

This bug was introduced by commit 33045b958bf590997b2765a5f0a17c2139d92b92
---

diff --git a/bin/launchConfigureParser.py b/bin/launchConfigureParser.py
index 51a197404..99db4a7cd 100755
--- a/bin/launchConfigureParser.py
+++ b/bin/launchConfigureParser.py
@@ -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)