Merge branch 'wktui-252' into 'main'

robertpatrick · robertpatrick · commit 194ccde6397a · 2024-04-18T14:07:49.000Z
fixing bug when handling Windows environment variables for token replacement

See merge request weblogic-cloud/weblogic-deploy-tooling!1675
diff --git a/core/src/main/python/wlsdeploy/util/variables.py b/core/src/main/python/wlsdeploy/util/variables.py
@@ -308,7 +308,7 @@ def _substitute(text, variables, model_context, error_info, attribute_name=None)
             #
             env_var_name = str_helper.to_string(key)
             is_windows = System.getProperty('os.name').startswith('Windows')
-            if is_windows and not env_helper.has_env(env_var_name) and env_var_name.has_env(env_var_name.upper()):
+            if is_windows and not env_helper.has_env(env_var_name) and env_helper.has_env(env_var_name.upper()):
                 env_var_name = env_var_name.upper()
 
             if not env_helper.has_env(env_var_name):

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ def _substitute(text, variables, model_context, error_info, attribute_name=None)`
`308`	`308`	`#`
`309`	`309`	`env_var_name = str_helper.to_string(key)`
`310`	`310`	`is_windows = System.getProperty('os.name').startswith('Windows')`
`311`		`- if is_windows and not env_helper.has_env(env_var_name) and env_var_name.has_env(env_var_name.upper()):`
	`311`	`+ if is_windows and not env_helper.has_env(env_var_name) and env_helper.has_env(env_var_name.upper()):`
`312`	`312`	`env_var_name = env_var_name.upper()`
`313`	`313`
`314`	`314`	`if not env_helper.has_env(env_var_name):`