From 465b97be7e74c492c6870d9edd178fa6ead07076 Mon Sep 17 00:00:00 2001 From: Richard C Isaacson Date: Mon, 17 Mar 2014 17:35:03 -0500 Subject: [PATCH] assemble module: fix insertion of newlines when not needed. This builds on GH-6359 and changes the logic so that a newline is only inserted between fragments if the previous fragment does not end with a newline. --- files/assemble | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/files/assemble b/files/assemble index b7d6c38a04d..7f0a9d1e0a1 100644 --- a/files/assemble +++ b/files/assemble @@ -102,17 +102,22 @@ def assemble_from_fragments(src_path, delimiter=None, compiled_regexp=None): tmpfd, temp_path = tempfile.mkstemp() tmp = os.fdopen(tmpfd,'w') delimit_me = False + add_newline = False for f in sorted(os.listdir(src_path)): if compiled_regexp and not compiled_regexp.search(f): continue fragment = "%s/%s" % (src_path, f) + if not os.path.isfile(fragment): + continue + fragment_content = file(fragment).read() + + # always put a newline between fragments if the previous fragment didn't end with a newline. + if add_newline: + tmp.write('\n') # delimiters should only appear between fragments if delimit_me: - # always put a newline between fragments - tmp.write('\n') - if delimiter: # un-escape anything like newlines delimiter = delimiter.decode('unicode-escape') @@ -122,9 +127,12 @@ def assemble_from_fragments(src_path, delimiter=None, compiled_regexp=None): if delimiter[-1] != '\n': tmp.write('\n') - if os.path.isfile(fragment): - tmp.write(file(fragment).read()) + tmp.write(fragment_content) delimit_me = True + if fragment_content.endswith('\n'): + add_newline = False + else: + add_newline = True tmp.close() return temp_path