make lineinfile docs clearer and make module pep8 (#23857)

pull/23892/head
Sloane Hertel 8 years ago committed by René Moser
parent 35e03cb140
commit 00ebd0c89d

@ -55,7 +55,7 @@ options:
description: description:
- The regular expression to look for in every line of the file. For - The regular expression to look for in every line of the file. For
C(state=present), the pattern to replace if found; only the last line C(state=present), the pattern to replace if found; only the last line
found will be replaced. For C(state=absent), the pattern of the line found will be replaced. For C(state=absent), the pattern of the line(s)
to remove. Uses Python regular expressions; see to remove. Uses Python regular expressions; see
U(http://docs.python.org/2/library/re.html). U(http://docs.python.org/2/library/re.html).
state: state:
@ -216,8 +216,8 @@ def write_changes(module, b_lines, dest):
'rc:%s error:%s' % (rc, err)) 'rc:%s error:%s' % (rc, err))
if valid: if valid:
module.atomic_move(tmpfile, module.atomic_move(tmpfile,
to_native(os.path.realpath(to_bytes(dest, errors='surrogate_or_strict')), errors='surrogate_or_strict'), to_native(os.path.realpath(to_bytes(dest, errors='surrogate_or_strict')), errors='surrogate_or_strict'),
unsafe_writes=module.params['unsafe_writes']) unsafe_writes=module.params['unsafe_writes'])
def check_file_attrs(module, changed, message, diff): def check_file_attrs(module, changed, message, diff):
@ -379,6 +379,7 @@ def absent(module, dest, regexp, line, backup):
found = [] found = []
b_line = to_bytes(line, errors='surrogate_or_strict') b_line = to_bytes(line, errors='surrogate_or_strict')
def matcher(b_cur_line): def matcher(b_cur_line):
if regexp is not None: if regexp is not None:
match_found = bre_c.search(b_cur_line) match_found = bre_c.search(b_cur_line)

@ -418,7 +418,6 @@ lib/ansible/modules/files/copy.py
lib/ansible/modules/files/find.py lib/ansible/modules/files/find.py
lib/ansible/modules/files/ini_file.py lib/ansible/modules/files/ini_file.py
lib/ansible/modules/files/iso_extract.py lib/ansible/modules/files/iso_extract.py
lib/ansible/modules/files/lineinfile.py
lib/ansible/modules/files/patch.py lib/ansible/modules/files/patch.py
lib/ansible/modules/files/replace.py lib/ansible/modules/files/replace.py
lib/ansible/modules/files/stat.py lib/ansible/modules/files/stat.py

Loading…
Cancel
Save