wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

switched clean_data from hardcoded delimiters to actual currently set jinja2 environment delimiters

Browse source
This commit is contained in:
Brian Coca 2015-11-02 09:00:56 -05:00
parent 467c29e3db
commit 79bf66336b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/template/__init__.py
View file

@ -232,18 +232,18 @@ class Templar:
elif token[1] == self.variable_end[1]: elif token[1] == self.variable_end[1]:
prev_idx = None prev_idx = None
if token == '%}' and block_openings: if token == self.block_end and block_openings:
prev_idx = block_openings.pop() prev_idx = block_openings.pop()
elif token == '}}' and print_openings: elif token == self.variable_end and print_openings:
prev_idx = print_openings.pop() prev_idx = print_openings.pop()
if prev_idx is not None: if prev_idx is not None:
# replace the opening # replace the opening
data.seek(prev_idx, os.SEEK_SET) data.seek(prev_idx, os.SEEK_SET)
data.write('{#') data.write(self.environment.comment_start_string)
# replace the closing # replace the closing
data.seek(token_start, os.SEEK_SET) data.seek(token_start, os.SEEK_SET)
data.write('#}') data.write(self.environment.comment_end_string)
else: else:
raise AnsibleError("Error while cleaning data for safety: unhandled regex match") raise AnsibleError("Error while cleaning data for safety: unhandled regex match")