Switch blockinfile to using the latest best way to get ansible version

reviewable/pr18780/r1
Toshio Kuratomi 9 years ago
parent 3a7e4b5834
commit 1846de2809

@ -150,8 +150,6 @@ import re
import os import os
import tempfile import tempfile
from ansible import __version__
def write_changes(module, contents, dest): def write_changes(module, contents, dest):
@ -246,7 +244,7 @@ def main():
marker1 = re.sub(r'{mark}', 'END', marker) marker1 = re.sub(r'{mark}', 'END', marker)
if present and block: if present and block:
# Escape seqeuences like '\n' need to be handled in Ansible 1.x # Escape seqeuences like '\n' need to be handled in Ansible 1.x
if __version__.startswith('1.'): if module.constants['ANSIBLE_VERSION'].startswith('1.'):
block = re.sub('', block, '') block = re.sub('', block, '')
blocklines = [marker0] + block.splitlines() + [marker1] blocklines = [marker0] + block.splitlines() + [marker1]
else: else:

Loading…
Cancel
Save