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

assemble module: fix insertion of newlines when not needed.

Browse source 
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.
This commit is contained in:
Richard C Isaacson 2014-03-17 17:35:03 -05:00 committed by James Cammarata
parent 53c1d25c70
commit 465b97be7e
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
files/assemble
View file

@ -102,17 +102,22 @@ def assemble_from_fragments(src_path, delimiter=None, compiled_regexp=None):
tmpfd, temp_path = tempfile.mkstemp() tmpfd, temp_path = tempfile.mkstemp()
tmp = os.fdopen(tmpfd,'w') tmp = os.fdopen(tmpfd,'w')
delimit_me = False delimit_me = False
add_newline = False
for f in sorted(os.listdir(src_path)): for f in sorted(os.listdir(src_path)):
if compiled_regexp and not compiled_regexp.search(f): if compiled_regexp and not compiled_regexp.search(f):
continue continue
fragment = "%s/%s" % (src_path, f) 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 # delimiters should only appear between fragments
if delimit_me: if delimit_me:
# always put a newline between fragments
tmp.write('\n')
if delimiter: if delimiter:
# un-escape anything like newlines # un-escape anything like newlines
delimiter = delimiter.decode('unicode-escape') delimiter = delimiter.decode('unicode-escape')
@ -122,9 +127,12 @@ def assemble_from_fragments(src_path, delimiter=None, compiled_regexp=None):
if delimiter[-1] != '\n': if delimiter[-1] != '\n':
tmp.write('\n') tmp.write('\n')
if os.path.isfile(fragment): tmp.write(fragment_content)
tmp.write(file(fragment).read())
delimit_me = True delimit_me = True
if fragment_content.endswith('\n'):
add_newline = False
else:
add_newline = True
tmp.close() tmp.close()
return temp_path return temp_path