cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'issue_5679_lineinfile' into fix_lineinfile_newlines

Browse source
This commit is contained in:
James Cammarata 2014-06-20 00:17:49 -05:00
commit 4adf2c4dfd
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
files/lineinfile
View file

@ -19,6 +19,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
import pipes
import re import re
import os import os
import tempfile import tempfile
@ -359,9 +360,14 @@ def main():
if ins_bef is None and ins_aft is None: if ins_bef is None and ins_aft is None:
ins_aft = 'EOF' ins_aft = 'EOF'
# Replace the newline character with an actual newline. Don't replace # Replace escape sequences like '\n' while being sure
# escaped \\n, hence sub and not str.replace. # not to replace octal escape sequences (\ooo) since they
line = re.sub(r'\n', os.linesep, params['line']) # match the backref syntax
if backrefs:
line = re.sub(r'(\\[0-9]{1,3})', r'\\\1', params['line'])
else:
line = params['line']
line = module.safe_eval(pipes.quote(line))
present(module, dest, params['regexp'], line, present(module, dest, params['regexp'], line,
ins_aft, ins_bef, create, backup, backrefs) ins_aft, ins_bef, create, backup, backrefs)