cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Preserve trailing newline after templating.

Browse source 
Jinja seems to eat trailing whitespace. A lot of tools complain about this: iptables-restore, iscsid...
This commit is contained in:
Jeroen Hoekx 2012-05-09 10:31:32 +02:00
parent 1dbea82350
commit 55fbc95243
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/utils.py
View file

@ -241,7 +241,10 @@ def template(text, vars, setup_cache, no_engine=False):
return text return text
else: else:
template = jinja2.Template(text) template = jinja2.Template(text)
return template.render(vars) res = template.render(vars)
if text.endswith('\n') and not res.endswith('\n'):
res = res + '\n'
return res
def double_template(text, vars, setup_cache): def double_template(text, vars, setup_cache):
return template(template(text, vars, setup_cache), vars, setup_cache) return template(template(text, vars, setup_cache), vars, setup_cache)