lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-16 01:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

(configd) fix for https://github.com/opnsense/core/issues/306

Browse Source
This commit is contained in:
Ad Schellevis 2015-08-07 10:36:19 +02:00
parent afef4391ec
commit d8a81cda7b
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/opnsense/service/modules/template.py
View File

@ -218,7 +218,8 @@ class Template(object):
result_filenames[new_filename] = copy.deepcopy(result_filenames[filename])
result_filenames[new_filename][key] = target_filters[target_filter][key]
j2_page = self._j2_env.get_template('%s/%s' % (module_name.replace('.', '/'), src_template))
template_filename = '%s/%s'%(module_name.replace('.', '/'), src_template)
j2_page = self._j2_env.get_template(template_filename)
for filename in result_filenames.keys():
if not (filename.find('[') != -1 and filename.find(']') != -1):
# copy config data
@ -241,6 +242,17 @@ class Template(object):
f_out = open(filename, 'wb')
f_out.write(content)
# Check if the last character of our output contains an end-of-line, if not copy it in if
# it was in the original template.
# It looks like Jinja sometimes isn't consistent on placing this last end-of-line in.
if content[-1] != '\n':
src_file = '%s%s'%(self._template_dir,template_filename)
src_file_handle = open(src_file,'r')
src_file_handle.seek(-1, os.SEEK_END)
last_bytes_template = src_file_handle.read()
src_file_handle.close()
if last_bytes_template in ('\n', '\r'):
f_out.write('\n')
f_out.close()
result.append(filename)