Commit 8b2cd641 by Michael DeHaan

When inside an apt or yum task account for multiple conditionals. Fixes 4745.

parent d34a26e3
......@@ -165,6 +165,11 @@ def is_changed(result):
def check_conditional(conditional, basedir, inject, fail_on_undefined=False, jinja2=False):
if isinstance(conditional, list):
for x in conditional:
if not check_conditional(x, basedir, inject, fail_on_undefined=fail_on_undefined, jinja2=jinja2):
return False
return True
if jinja2:
conditional = "jinja2_compare %s" % conditional
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment