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

_get_line_indent renamed to _set_line_indent

Browse source
This commit is contained in:
JerzyX Drozdz 2018-03-01 10:41:48 +01:00 • committed by rallytime
parent f9fd1a889a
commit 464eef6fe1
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
salt/modules/file.py Normal file → Executable file
View file

@ -1745,7 +1745,7 @@ def _assert_occurrence(src, probe, target, amount=1):
return occ
def _get_line_indent(src, line, indent):
def _set_line_indent(src, line, indent):
'''
Indent the line with the source line.
'''
@ -1758,7 +1758,7 @@ def _get_line_indent(src, line, indent):
break
idt.append(c)
return ''.join(idt) + line.strip()
return ''.join(idt) + line.lstrip()
def line(path, content=None, match=None, mode=None, location=None,
@ -1901,7 +1901,7 @@ def line(path, content=None, match=None, mode=None, location=None,
elif mode == 'delete':
body = os.linesep.join([line for line in body.split(os.linesep) if line.find(match) < 0])
elif mode == 'replace':
body = os.linesep.join([(_get_line_indent(file_line, content, indent)
body = os.linesep.join([(_set_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)])
elif mode == 'insert':
@ -1919,7 +1919,7 @@ def line(path, content=None, match=None, mode=None, location=None,
if line.find(after) > -1:
in_range = True
elif line.find(before) > -1 and in_range:
out.append(_get_line_indent(line, content, indent))
out.append(_set_line_indent(line, content, indent))
out.append(line)
body = os.linesep.join(out)
@ -1930,7 +1930,7 @@ def line(path, content=None, match=None, mode=None, location=None,
for idx in range(len(lines)):
_line = lines[idx]
if _line.find(before) > -1:
cnd = _get_line_indent(_line, content, indent)
cnd = _set_line_indent(_line, content, indent)
if not idx or (idx and _starts_till(lines[idx - 1], cnd) < 0): # Job for replace instead
out.append(cnd)
out.append(_line)
@ -1942,7 +1942,7 @@ def line(path, content=None, match=None, mode=None, location=None,
lines = body.split(os.linesep)
for idx, _line in enumerate(lines):
out.append(_line)
cnd = _get_line_indent(_line, content, indent)
cnd = _set_line_indent(_line, content, indent)
# No duplicates or append, if "after" is the last line
if (_line.find(after) > -1 and
(lines[((idx + 1) < len(lines)) and idx + 1 or idx].strip() != cnd or
@ -1954,7 +1954,7 @@ def line(path, content=None, match=None, mode=None, location=None,
if location == 'start':
body = os.linesep.join((content, body))
elif location == 'end':
body = os.linesep.join((body, _get_line_indent(body[-1], content, indent) if body else content))
body = os.linesep.join((body, _set_line_indent(body[-1], content, indent) if body else content))
elif mode == 'ensure':
after = after and after.strip()
@ -1987,7 +1987,7 @@ def line(path, content=None, match=None, mode=None, location=None,
for idx in range(len(body)):
if body[idx].find(before) > -1:
prev = (idx > 0 and idx or 1) - 1
out.append(_get_line_indent(body[idx], content, indent))
out.append(_set_line_indent(body[idx], content, indent))
if _starts_till(out[prev], content) > -1:
del out[prev]
out.append(body[idx])
@ -2006,7 +2006,7 @@ def line(path, content=None, match=None, mode=None, location=None,
next_line = idx + 1 < len(body) and body[idx + 1] or None
if next_line is not None and _starts_till(next_line, content) > -1:
skip = next_line
out.append(_get_line_indent(body[idx], content, indent))
out.append(_set_line_indent(body[idx], content, indent))
body = os.linesep.join(out)
else:

28
salt/modules/win_file.py Normal file → Executable file
View file

@ -46,20 +46,20 @@ import salt.utils.path
import salt.utils.platform
import salt.utils.user
from salt.modules.file import (check_hash, # pylint: disable=W0611
directory_exists, get_managed,
check_managed, check_managed_changes, source_list,
touch, append, contains, contains_regex, get_source_sum,
contains_glob, find, psed, get_sum, _get_bkroot, _mkstemp_copy,
get_hash, manage_file, file_exists, get_diff, line, list_backups,
__clean_tmp, check_file_meta, _binary_replace,
_splitlines_preserving_trailing_newline, restore_backup,
access, copy, readdir, read, rmdir, truncate, replace, delete_backup,
search, _get_flags, extract_hash, _error, _sed_esc, _psed,
RE_FLAG_TABLE, blockreplace, prepend, seek_read, seek_write, rename,
lstat, path_exists_glob, write, pardir, join, HASHES, HASHES_REVMAP,
comment, uncomment, _add_flags, comment_line, _regex_to_static,
_get_line_indent, apply_template_on_contents, dirname, basename,
list_backups_dir, _assert_occurrence, _starts_till)
directory_exists, get_managed,
check_managed, check_managed_changes, source_list,
touch, append, contains, contains_regex, get_source_sum,
contains_glob, find, psed, get_sum, _get_bkroot, _mkstemp_copy,
get_hash, manage_file, file_exists, get_diff, line, list_backups,
__clean_tmp, check_file_meta, _binary_replace,
_splitlines_preserving_trailing_newline, restore_backup,
access, copy, readdir, read, rmdir, truncate, replace, delete_backup,
search, _get_flags, extract_hash, _error, _sed_esc, _psed,
RE_FLAG_TABLE, blockreplace, prepend, seek_read, seek_write, rename,
lstat, path_exists_glob, write, pardir, join, HASHES, HASHES_REVMAP,
comment, uncomment, _add_flags, comment_line, _regex_to_static,
_set_line_indent, apply_template_on_contents, dirname, basename,
list_backups_dir, _assert_occurrence, _starts_till)
from salt.modules.file import normpath as normpath_
from salt.utils.functools import namespaced_function as _namespaced_function