From 3f052ead3a6d7cbc4296cd8b36465466d511ae6a Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Mon, 11 Aug 2014 11:22:59 -0500 Subject: [PATCH] Make sure we only use unquote on quoted lines in lineinfile when needed --- files/lineinfile | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/files/lineinfile b/files/lineinfile index f40ebb341e2..ba842e15e2a 100644 --- a/files/lineinfile +++ b/files/lineinfile @@ -363,14 +363,22 @@ def main(): if ins_bef is None and ins_aft is None: ins_aft = 'EOF' + line = params['line'] + + # The safe_eval call will remove some quoting, but not others, + # so we need to know if we should specifically unquote it. + should_unquote = not is_quoted(line) + # Replace escape sequences like '\n' while being sure # not to replace octal escape sequences (\ooo) since they - # match the backref syntax + # match the backref syntax. if backrefs: - line = re.sub(r'(\\[0-9]{1,3})', r'\\\1', params['line']) - else: - line = params['line'] - line = unquote(module.safe_eval(pipes.quote(line))) + line = re.sub(r'(\\[0-9]{1,3})', r'\\\1', line) + line = module.safe_eval(pipes.quote(line)) + + # Now remove quotes around the string, if needed + if should_unquote: + line = unquote(line) present(module, dest, params['regexp'], line, ins_aft, ins_bef, create, backup, backrefs)