From 731335c587a8e83d29ffaadffc5fcf72d42c5cfb Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 30 Dec 2019 12:22:26 +0300 Subject: [PATCH] bos #18467 Minor correction to setenv.py --- bin/setenv.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 # ----------------------------------------------------------------------------- -- 2.39.2