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

Merge pull request #39221 from lvg01/fix-bug-39220

Browse source 
Fix bug 39220
This commit is contained in:
Mike Place 2017-02-09 11:12:28 -07:00 • committed by GitHub
commit 52440416ca
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/modules/file.py
View file

@ -1395,7 +1395,7 @@ def _get_line_indent(src, line, indent):
'''
Indent the line with the source line.
'''
if not (indent or line):
if not indent:
return line
idt = []
@ -1598,7 +1598,6 @@ def line(path, content, match=None, mode=None, location=None,
elif mode == 'ensure':
after = after and after.strip()
before = before and before.strip()
content = content and content.strip()
if before and after:
_assert_occurrence(body, before, 'before')