summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Baklanov <antonbaklanov@gmail.com>2017-09-08 19:52:43 -0300
committerToshio Kuratomi <a.badger@gmail.com>2017-09-09 12:49:44 -0700
commit4367a456680731dcb39cf41fb57a86062667d9c2 (patch)
tree893c7eb42f007d53e71ba8f1c28bfb9b6fcf776d
parentafa71ace679d02272022f5c54e1bf6b15c0a9ff4 (diff)
downloadansible-4367a456680731dcb39cf41fb57a86062667d9c2.tar.gz
Fixes #26793: convert insert regex to_bytes before searching
(cherry picked from commit fcad4f38b4d9f21be0fc9f65609f8a322cba076a)
-rw-r--r--lib/ansible/modules/files/blockinfile.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/modules/files/blockinfile.py b/lib/ansible/modules/files/blockinfile.py
index 62983f1fc0..7f34295722 100644
--- a/lib/ansible/modules/files/blockinfile.py
+++ b/lib/ansible/modules/files/blockinfile.py
@@ -254,9 +254,9 @@ def main():
insertafter = 'EOF'
if insertafter not in (None, 'EOF'):
- insertre = re.compile(insertafter)
+ insertre = re.compile(to_bytes(insertafter, errors='surrogate_or_strict'))
elif insertbefore not in (None, 'BOF'):
- insertre = re.compile(insertbefore)
+ insertre = re.compile(to_bytes(insertbefore, errors='surrogate_or_strict'))
else:
insertre = None