Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added support for mixed line ending in file #45498

Closed
wants to merge 15 commits into from
Closed

Added support for mixed line ending in file #45498

Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3ba0faf
Added support for mixed line ending in file
Jan 17, 2018
c672328
Merge branch '2017.7' into 2017.7_line_mixed_line_ends
t0fik Jan 19, 2018
7c72149
Merge branch '2017.7' into 2017.7_line_mixed_line_ends
t0fik Feb 2, 2018
3533885
line function now detects file line endings
t0fik Feb 2, 2018
25d6769
Added _get_line_ending to import in win_file module
t0fik Feb 2, 2018
595bdda
Fixes after changes
t0fik Feb 3, 2018
d2fec06
Merge branch '2017.7' into 2017.7_line_mixed_line_ends
t0fik Feb 3, 2018
3488139
Force setting eol
t0fik Feb 4, 2018
e204e5d
Functions _get_line_indent and _get_line_ending renamed to _set_line_…
t0fik Feb 6, 2018
6a1f6aa
pylint problems fixed
t0fik Feb 6, 2018
8684710
Fixed "IndexError: list index out of range"
t0fik Feb 6, 2018
35b74d8
Merge branch '2017.7' into 2017.7_line_mixed_line_ends
t0fik Feb 8, 2018
f5fecc4
Added guard statement for searching lineseparator
t0fik Feb 28, 2018
4d0ec78
Fixed indentation
t0fik Feb 28, 2018
bbbb8f1
Forcing line separator on last line
t0fik Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 15 additions & 8 deletions salt/modules/file.py
View file
Open in desktop
Expand Up @@ -1693,6 +1693,13 @@ def line(path, content=None, match=None, mode=None, location=None,

salt '*' file.line /path/to/file content="CREATEMAIL_SPOOL=no" match="CREATE_MAIL_SPOOL=yes" mode="replace"
'''
def _split(content):
split_content = []
for linesep_line in content.split(os.linesep):
for content_line in linesep_line.split('\n'):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code makes a difference only being executed on platforms with os.linesep != '\n'... Why not use str.splitlines() instead?

Copy link
Contributor Author

@t0fik t0fik Jan 19, 2018 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm aware of that.
That specific part of code was tested in file.blockreplace. I do not know how str.splitlines() will behave

split_content.append(content_line)
return split_content

path = os.path.realpath(os.path.expanduser(path))
if not os.path.isfile(path):
if not quiet:
Expand Down Expand Up @@ -1728,11 +1735,11 @@ def line(path, content=None, match=None, mode=None, location=None,
log.warning('Cannot find text to {0}. File \'{1}\' is empty.'.format(mode, path))
body = ''
elif mode == 'delete':
body = os.linesep.join([line for line in body.split(os.linesep) if line.find(match) < 0])
body = os.linesep.join([line for line in _split(body) if line.find(match) < 0])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Joining with os.linesep and splitting by something else will lead to all the line breaks replaced in the file...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems legit to me, to output file with line endings proper to OS.
Converting '\n' to os.linesep is default python behavior for not binary writes.

elif mode == 'replace':
body = os.linesep.join([(_get_line_indent(file_line, content, indent)
if (file_line.find(match) > -1 and not file_line == content) else file_line)
for file_line in body.split(os.linesep)])
for file_line in _split(body)])
elif mode == 'insert':
if not location and not before and not after:
raise CommandExecutionError('On insert must be defined either "location" or "before/after" conditions.')
Expand All @@ -1742,7 +1749,7 @@ def line(path, content=None, match=None, mode=None, location=None,
_assert_occurrence(body, before, 'before')
_assert_occurrence(body, after, 'after')
out = []
lines = body.split(os.linesep)
lines = _split(body)
for idx in range(len(lines)):
_line = lines[idx]
if _line.find(before) > -1 and idx <= len(lines) and lines[idx - 1].find(after) > -1:
Expand All @@ -1755,7 +1762,7 @@ def line(path, content=None, match=None, mode=None, location=None,
if before and not after:
_assert_occurrence(body, before, 'before')
out = []
lines = body.split(os.linesep)
lines = _split(body)
for idx in range(len(lines)):
_line = lines[idx]
if _line.find(before) > -1:
Expand All @@ -1768,7 +1775,7 @@ def line(path, content=None, match=None, mode=None, location=None,
elif after and not before:
_assert_occurrence(body, after, 'after')
out = []
lines = body.split(os.linesep)
lines = _split(body)
for idx in range(len(lines)):
_line = lines[idx]
out.append(_line)
Expand All @@ -1795,7 +1802,7 @@ def line(path, content=None, match=None, mode=None, location=None,

a_idx = b_idx = -1
idx = 0
body = body.split(os.linesep)
body = _split(body)
for _line in body:
idx += 1
if _line.find(before) > -1 and b_idx < 0:
Expand All @@ -1815,7 +1822,7 @@ def line(path, content=None, match=None, mode=None, location=None,

elif before and not after:
_assert_occurrence(body, before, 'before')
body = body.split(os.linesep)
body = _split(body)
out = []
for idx in range(len(body)):
if body[idx].find(before) > -1:
Expand All @@ -1828,7 +1835,7 @@ def line(path, content=None, match=None, mode=None, location=None,

elif not before and after:
_assert_occurrence(body, after, 'after')
body = body.split(os.linesep)
body = _split(body)
skip = None
out = []
for idx in range(len(body)):
Expand Down