From b3c8656c801fc89988402328159652282e52687e Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 11 Mar 2015 11:28:19 +0300 Subject: [PATCH] Fix regression introduced with commit 222f5118: Python scripts are not properly processed in case if --show-desktop=0 (-d0) option is used --- bin/launchConfigureParser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/launchConfigureParser.py b/bin/launchConfigureParser.py index 9883bd4dc..84e040859 100755 --- a/bin/launchConfigureParser.py +++ b/bin/launchConfigureParser.py @@ -1071,9 +1071,9 @@ def get_env(theAdditionalOptions=None, appname=salomeappname, cfgname=salomecfgn args["study_hdf"] = arg # Python scripts + from salomeContextUtils import getScriptsAndArgs, ScriptAndArgs + args[script_nam] = getScriptsAndArgs(cmd_args) if args[gui_nam] and args["session_gui"]: - from salomeContextUtils import getScriptsAndArgs, ScriptAndArgs - args[script_nam] = getScriptsAndArgs(cmd_args) new_args = [] for sa_obj in args[script_nam]: # args[script_nam] is a list of ScriptAndArgs objects script = re.sub(r'^python.*\s+', r'', sa_obj.script) -- 2.39.2