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

Replace weird splitlines behavior.

Browse Source
This commit is contained in:
Bo Maryniuk 2015-03-26 16:46:47 +01:00
parent 3cf0960dbb
commit c8e32d9e1c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/modules/file.py
View File

@ -1359,7 +1359,7 @@ def line(path, content, match=None, mode=None, location=None,
a_idx = b_idx = -1
idx = 0
body = body.splitlines()
body = body.split(os.linesep)
for _line in body:
idx += 1
if _line.find(before) > -1 and b_idx < 0:
@ -1380,7 +1380,7 @@ def line(path, content, match=None, mode=None, location=None,
elif before and not after:
_assert_occurrence(body, before, 'before')
body = body.splitlines()
body = body.split(os.linesep)
out = []
idx = 0
for _line in range(len(body)):
@ -1395,7 +1395,7 @@ def line(path, content, match=None, mode=None, location=None,
elif not before and after:
_assert_occurrence(body, after, 'after')
body = body.splitlines()
body = body.split(os.linesep)
skip = None
out = []
for idx in range(len(body)):