From d168c709d5288ba2a5c8956f011170e85c423c46 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 11 Oct 2013 20:43:16 -0400 Subject: [PATCH] Fix an issue where the ordering of an include statement is processed ahead of the conditional in the included statement, which required a redundant check to see if a variable was defined rather than short circuiting. Fixes #4469 --- lib/ansible/playbook/task.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/playbook/task.py b/lib/ansible/playbook/task.py index ebad7e7f6c..d2a0453608 100644 --- a/lib/ansible/playbook/task.py +++ b/lib/ansible/playbook/task.py @@ -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