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

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
parent 297593b27d 7a8eb0b670
commit 42b5294820
3 changed files with 10 additions and 2 deletions
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