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

Revert "Correctly catch template errors without returning invalid data"

Browse source 
This reverts commit 3cd7d47b7e.
This commit is contained in:
Michael DeHaan 2014-03-13 07:46:08 -04:00
parent e6f6a73328
commit d1753046e0
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/utils/template.py
View file

@ -316,8 +316,6 @@ def template_from_string(basedir, data, vars, fail_on_undefined=False):
except Exception, e: except Exception, e:
if 'recursion' in str(e): if 'recursion' in str(e):
raise errors.AnsibleError("recursive loop detected in template string: %s" % data) raise errors.AnsibleError("recursive loop detected in template string: %s" % data)
elif isinstance(e, TemplateSyntaxError):
raise errors.AnsibleError("there was an error in the template: %s" % data)
else: else:
return data return data