preserve newline at end of templates 12/512/1
authordavidplunkett <dp7642@att.com>
Tue, 26 Mar 2019 23:58:53 +0000 (23:58 +0000)
committerdavidplunkett <dp7642@att.com>
Tue, 26 Mar 2019 23:58:53 +0000 (23:58 +0000)
Change-Id: I4b9585cd68ba00d8ea45b489439b33ebe6976300
Signed-off-by: davidplunkett <dp7642@att.com>
scripts/jcopy.py

index 172cac3..0efb437 100755 (executable)
@@ -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: