saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Split by Windows and Linux style line endings

Browse source
This commit is contained in:
twangboy 2017-08-24 17:06:10 -06:00
parent e20aa5c39b
commit b55172d5dc
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
salt/modules/file.py
View file

@ -2385,14 +2385,22 @@ def blockreplace(path,
# end of block detected
in_block = False
# Check for multi-line '\n' terminated content as split will
# introduce an unwanted additional new line.
if content and content[-1] == os.linesep:
content = content[:-1]
# Separate the content into lines. Account for Windows
# style line endings using os.linesep, then by linux
# style line endings
split_content = []
for linesep_line in content.split(os.linesep):
for content_line in linesep_line.split('\n'):
split_content.append(content_line)
# Trim any trailing new lines to avoid unwanted
# additional new lines
while not split_content[-1]:
split_content.pop()
# push new block content in file
for cline in content.split(os.linesep):
new_file.append(cline + os.linesep)
for content_line in split_content:
new_file.append(content_line + os.linesep)
done = True