Correct logic around determining environment variable existence

Fixes #13105
This commit is contained in:
James Cammarata 2015-11-09 21:04:24 -05:00
parent c753ae6e22
commit 09994c18f3

View file

@ -329,7 +329,8 @@ class VariableManager:
# special case for the 'environment' magic variable, as someone # special case for the 'environment' magic variable, as someone
# may have set it as a variable and we don't want to stomp on it # may have set it as a variable and we don't want to stomp on it
if task and 'environment' not in all_vars: if task:
if 'environment' not in all_vars:
all_vars['environment'] = task.environment all_vars['environment'] = task.environment
else: else:
display.warning("The variable 'environment' appears to be used already, which is also used internally for environment variables set on the task/block/play. You should use a different variable name to avoid conflicts with this internal variable") display.warning("The variable 'environment' appears to be used already, which is also used internally for environment variables set on the task/block/play. You should use a different variable name to avoid conflicts with this internal variable")