PR: merge from branch BR_3_1_0deb tag mergeto_trunk_22dec05

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

diff --git a/bin/runSalome.py b/bin/runSalome.py
index c4773d189c718681464821f4209195be5c7574ae..9d0a669711ce120fc1f792b9b2672313730f2ede 100755 (executable)
--- 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")
@@ -408,6 +411,8 @@ class SessionServer(Server):
             self.SCMD2+=['GUI']
         if self.args['splash']:
             self.SCMD2+=['SPLASH']
+        if self.args['noexcepthandler']:
+            self.SCMD2+=['noexcepthandler']
         if self.args.has_key('modules'):
             self.SCMD2+=['--modules (']
             for mod in self.args['modules']: