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

Remove duplicate compiling of task when: statements

Browse source 
Fixes #8538
This commit is contained in:
James Cammarata 2014-08-11 13:13:48 -05:00
parent e49c4e298f
commit 20957a1b85
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -563,12 +563,6 @@ class Play(object):
if 'vars' in x:
task_vars = utils.combine_vars(task_vars, x['vars'])
if 'when' in x:
if isinstance(x['when'], (basestring, bool)):
included_additional_conditions.append(x['when'])
elif isinstance(x['when'], list):
included_additional_conditions.extend(x['when'])
new_role = None
if 'role_name' in x:
new_role = x['role_name']

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

@ -300,6 +300,7 @@ class Task(object):
self.tags.extend(import_tags)
if additional_conditions:
new_conditions = additional_conditions
new_conditions.append(self.when)
new_conditions = additional_conditions[:]
if self.when:
new_conditions.append(self.when)
self.when = new_conditions