From: vsr <vsr@opencascade.com>
Date: Wed, 7 Dec 2005 12:24:28 +0000 (+0000)
Subject: CSF_PluginDefaults environment variable should be set to default value only if it... 
X-Git-Tag: T_3_1_0pre~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3f3c049993eaf78a6d912cfafcab48f9787128f7;p=modules%2Fkernel.git

CSF_PluginDefaults environment variable should be set to default value only if it is not customized by the user (e.g. if there is a custom CAF-based application or module)
---

diff --git a/bin/runSalome.py b/bin/runSalome.py
index c4773d189..0399d6b21 100755
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -184,9 +184,12 @@ def set_env(args, modules_list, modules_root_dir):
         if not os.getenv("SalomeAppConfig"): os.environ["SalomeAppConfig"] =  os.getenv("GUI_ROOT_DIR") + "/share/salome/resources"
         pass   
 
-    os.environ["CSF_PluginDefaults"] \
-    = os.path.join(modules_root_dir["KERNEL"],"share",
-                   salome_subdir,"resources")
+    # set CSF_PluginDefaults variable only if it is not customized
+    # by the user
+    if not os.getenv("CSF_PluginDefaults"):
+        os.environ["CSF_PluginDefaults"] \
+        = os.path.join(modules_root_dir["KERNEL"],"share",
+                       salome_subdir,"resources")
     os.environ["CSF_SALOMEDS_ResourcesDefaults"] \
     = os.path.join(modules_root_dir["KERNEL"],"share",
                    salome_subdir,"resources")