From 49c9949d3c176726a639ab6003efe184441d641c Mon Sep 17 00:00:00 2001 From: davidplunkett Date: Tue, 26 Mar 2019 23:58:53 +0000 Subject: [PATCH] preserve newline at end of templates Change-Id: I4b9585cd68ba00d8ea45b489439b33ebe6976300 Signed-off-by: davidplunkett --- scripts/jcopy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/jcopy.py b/scripts/jcopy.py index 172cac3..0efb437 100755 --- a/scripts/jcopy.py +++ b/scripts/jcopy.py @@ -52,10 +52,10 @@ with open(yaml_input) as f: siteyaml = yaml.safe_load(f) if os.path.isfile(j2in_name): - j2_env = jinja2.Environment(loader=jinja2.FileSystemLoader(os.path.dirname(j2in_name)), trim_blocks=True, lstrip_blocks=True, undefined=jinja2.make_logging_undefined()) + j2_env = jinja2.Environment(loader=jinja2.FileSystemLoader(os.path.dirname(j2in_name)), trim_blocks=True, lstrip_blocks=True, keep_trailing_newline=True, undefined=jinja2.make_logging_undefined()) expand_template(j2_env.get_template(name=os.path.basename(j2in_name)),yaml_out,len(j2in_name)) else: - j2_env = jinja2.Environment(loader=jinja2.FileSystemLoader(j2in_name), trim_blocks=True, lstrip_blocks=True, undefined=jinja2.make_logging_undefined()) + j2_env = jinja2.Environment(loader=jinja2.FileSystemLoader(j2in_name), trim_blocks=True, lstrip_blocks=True, keep_trailing_newline=True, undefined=jinja2.make_logging_undefined()) templates=j2_env.list_templates(extensions=('j2')) fill=len(max(templates,key=len))+len(j2in_name) for f in templates: -- 2.16.6