internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 13:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not strip new lines in native jinja (#46751)

Browse Source 
* Do not strip new lines in native jinja

* Add changelog/fragment
This commit is contained in:
Martin Krizek
2018-10-19 00:14:43 +02:00
committed by GitHub
parent 4d9504e775
commit 541255a2d8
5 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ansible/template/__init__.py
View File

@@ -621,10 +621,7 @@ class Templar:
# For preserving the number of input newlines in the output (used
# later in this method)
if not USE_JINJA2_NATIVE:
data_newlines = _count_newlines_from_end(data)
else:
data_newlines = None
data_newlines = _count_newlines_from_end(data)
if fail_on_undefined is None:
fail_on_undefined = self._fail_on_undefined_errors
@@ -690,7 +687,7 @@ class Templar:
display.debug("failing because of a type error, template data is: %s" % to_native(data))
raise AnsibleError("Unexpected templating type error occurred on (%s): %s" % (to_native(data), to_native(te)))
if USE_JINJA2_NATIVE:
if USE_JINJA2_NATIVE and not isinstance(res, string_types):
return res
if preserve_trailing_newlines: