From: vsr <vsr@opencascade.com>
Date: Mon, 30 Dec 2019 09:22:26 +0000 (+0300)
Subject: bos #18467 Minor correction to setenv.py
X-Git-Tag: EMC2P_V_1_2_0~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=731335c587a8e83d29ffaadffc5fcf72d42c5cfb;p=modules%2Fkernel.git

bos #18467 Minor correction to setenv.py
---

diff --git a/bin/setenv.py b/bin/setenv.py
index 887a5ea32..4858eb4ce 100755
--- a/bin/setenv.py
+++ b/bin/setenv.py
@@ -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
 
 # -----------------------------------------------------------------------------