Fix return statement for 'salome context'

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

diff --git a/bin/setenv.py b/bin/setenv.py
index b8eb466f8137327c7c2901b5d7b6fd1e141fc2a2..242f492cd37493fd6bb8fffd3baec901c0c70d31 100755 (executable)
--- a/bin/setenv.py
+++ b/bin/setenv.py
@@ -106,7 +106,7 @@ def get_config(silent=False, exeName=None):
 
     modules_list = []
     if args.has_key("modules"):
-        modules_list += args["modules"]
+        modules_list += [a for a in args["modules"] if a.strip()]
     # KERNEL must be last in the list to locate it at the first place in PATH
     if args["gui"] :
         modules_list[:0] = ["GUI"]
@@ -177,6 +177,9 @@ def set_env(args, modules_list, modules_root_dir, silent=False):
             if sys.platform == "win32":
               add_path(os.path.join(module_root_dir,get_lib_dir(),salome_subdir),
                      "PATH")
+            elif sys.platform == "darwin":
+              add_path(os.path.join(module_root_dir,get_lib_dir(),salome_subdir),
+                     "DYLD_LIBRARY_PATH")
             else:
               add_path(os.path.join(module_root_dir,get_lib_dir(),salome_subdir),
                      "LD_LIBRARY_PATH")