wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Set Jinja2's keep_trailing_newline=True in template_from_string."

Browse source 
This reverts commit 7a8eb0b670.
This commit is contained in:
James Cammarata 2014-07-17 09:07:04 -05:00
parent 03efbfca29
commit 0e5b0a2e97
3 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/utils/template.py
View file

@ -322,7 +322,7 @@ def template_from_string(basedir, data, vars, fail_on_undefined=False):
def my_finalize(thing): def my_finalize(thing):
return thing if thing is not None else '' return thing if thing is not None else ''
environment = jinja2.Environment(trim_blocks=True, keep_trailing_newline=True, undefined=StrictUndefined, extensions=_get_extensions(), finalize=my_finalize) environment = jinja2.Environment(trim_blocks=True, undefined=StrictUndefined, extensions=_get_extensions(), finalize=my_finalize)
environment.filters.update(_get_filters()) environment.filters.update(_get_filters())
environment.template_class = J2Template environment.template_class = J2Template

8
test/integration/roles/test_template/tasks/main.yml
View file

@ -63,10 +63,4 @@
assert: assert:
that: that:
- "file_result.changed != True" - "file_result.changed != True"
# VERIFY STRING TEMPLATE PRESERVES NEWLINE
- name: ensure template strings preserve newline
assert:
that:
- "newline_no_template_string == newline_template_string"

2
test/integration/roles/test_template/vars/main.yml
View file

@ -1,3 +1 @@
templated_var: templated_var_loaded templated_var: templated_var_loaded
newline_template_string: "Hello {{ 'World' }}\n"
newline_no_template_string: "Hello World\n"