valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix: replace weird behaviour of 'splitlines' with an oldschool approach

Browse Source
This commit is contained in:
Bo Maryniuk 2015-03-26 15:25:44 +01:00
parent f3c4bb9f76
commit d7287bc08a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/file.py
View File

@ -1299,7 +1299,7 @@ def line(path, content, match=None, mode=None, location=None,
_assert_occurrence(body, before, 'before')
_assert_occurrence(body, after, 'after')
out = []
lines = body.splitlines()
lines = body.split(os.linesep)
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:
@ -1321,7 +1321,7 @@ def line(path, content, match=None, mode=None, location=None,
elif after and not before:
_assert_occurrence(body, after, 'after')
out = []
for _line in body.splitlines():
for _line in body.split(os.linesep):
out.append(_line)
if _line.find(after) > -1:
out.append(content.strip())