cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix an issue where the ordering of an include statement is processed ahead of the conditional in the included statement,

Browse source 
which required a redundant check to see if a variable was defined rather than short circuiting.

Fixes #4469
This commit is contained in:
Michael DeHaan 2013-10-11 20:43:16 -04:00
parent f51c19aaec
commit d168c709d5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/playbook/task.py
View file

@ -274,6 +274,6 @@ class Task(object):
self.only_if = utils.compile_when_to_only_if(self.when)
if additional_conditions:
self.only_if = [ self.only_if ]
self.only_if.extend(additional_conditions)
new_conditions = additional_conditions
new_conditions.append(self.only_if)
self.only_if = new_conditions