internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing broken patch 20957a1

Browse Source 
Also adds integration tests for nested includes with conditionals
This commit is contained in:
James Cammarata
2014-08-11 14:52:21 -05:00
parent b0295af7ee
commit 783a1e3dfc
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ansible/playbook/play.py
View File

@@ -540,11 +540,10 @@ class Play(object):
elif k.startswith("when_"):
utils.deprecated("\"when_<criteria>:\" is a removed deprecated feature, use the simplified 'when:' conditional directly", None, removed=True)
elif k == 'when':
if type(x[k]) is str:
included_additional_conditions.insert(0, x[k])
if isinstance(x[k], (basestring, bool)):
included_additional_conditions.append(x[k])
elif type(x[k]) is list:
for i in x[k]:
included_additional_conditions.insert(0, i)
included_additional_conditions.extend(x[k])
elif k in ("include", "vars", "default_vars", "sudo", "sudo_user", "role_name", "no_log"):
continue
else: