]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
bos #18467 Minor correction to setenv.py
authorvsr <vsr@opencascade.com>
Mon, 30 Dec 2019 09:22:26 +0000 (12:22 +0300)
committervsr <vsr@opencascade.com>
Mon, 30 Dec 2019 09:22:26 +0000 (12:22 +0300)
bin/setenv.py

index 887a5ea32637d53d02d5cb561d1fe9b4fa394cf6..4858eb4cef4832f26137aa89678a6d9941cc341d 100755 (executable)
@@ -247,8 +247,9 @@ def set_env(args, modules_list, modules_root_dir, silent=False, keepEnvironment=
 # -----------------------------------------------------------------------------
 
 def main(silent=False, exeName=None):
-    args, modules_list, modules_root_dir = get_config(silent=silent, exeName=exeName)
-    set_env(args, modules_list, modules_root_dir, silent=silent)
+    keep_env = not os.getenv('SALOME_PLEASE_SETUP_ENVIRONMENT_AS_BEFORE')
+    args, modules_list, modules_root_dir = get_config(silent=silent, exeName=exeName, keepEnvironment=keep_env)
+    set_env(args, modules_list, modules_root_dir, silent=silent, keepEnvironment=keep_env)
     return args
 
 # -----------------------------------------------------------------------------