archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Handle possible scenario where conditional might be an integer (whoa!) down the error path. Super rare but fixes #4483.

Browse Source
pull/4477/merge
Michael DeHaan 12 years ago
parent a956c2019f
commit c90a82fd52
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File

2
lib/ansible/utils/__init__.py
Unescape Escape View File

@ -175,7 +175,7 @@ def check_conditional(conditional, basedir, inject, fail_on_undefined=False, jin
if conditional in inject and str(inject[conditional]).find('-') == -1: if conditional in inject and str(inject[conditional]).find('-') == -1:
conditional = inject[conditional] conditional = inject[conditional]
conditional = template.template(basedir, conditional, inject, fail_on_undefined=fail_on_undefined) conditional = template.template(basedir, conditional, inject, fail_on_undefined=fail_on_undefined)
original = conditional.replace("jinja2_compare ","") original = str(conditional).replace("jinja2_compare ","")
# a Jinja2 evaluation that results in something Python can eval! # a Jinja2 evaluation that results in something Python can eval!
presented = "{%% if %s %%} True {%% else %%} False {%% endif %%}" % conditional presented = "{%% if %s %%} True {%% else %%} False {%% endif %%}" % conditional
conditional = template.template(basedir, presented, inject) conditional = template.template(basedir, presented, inject)

Write Preview
Loading…
Cancel
Save