ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Merge branch 'devel' of https://github.com/leverich/ansible into leverich-devel

Browse source
This commit is contained in:
James Cammarata 2014-07-16 14:02:13 -05:00
commit 42b5294820
3 changed files with 10 additions and 2 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):
return thing if thing is not None else ''
environment = jinja2.Environment(trim_blocks=True, undefined=StrictUndefined, extensions=_get_extensions(), finalize=my_finalize)
environment = jinja2.Environment(trim_blocks=True, keep_trailing_newline=True, undefined=StrictUndefined, extensions=_get_extensions(), finalize=my_finalize)
environment.filters.update(_get_filters())
environment.template_class = J2Template

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

@ -63,4 +63,10 @@
assert:
that:
- "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 +1,3 @@
templated_var: templated_var_loaded
newline_template_string: "Hello {{ 'World' }}\n"
newline_no_template_string: "Hello World\n"