Correctly catch template errors without returning invalid data

Fixes #6329
2014-03-07 14:36:54 -06:00 · 2014-03-07 14:36:54 -06:00 · 3cd7d47b7e
commit 3cd7d47b7e
parent c7d1c1a306
1 changed files with 2 additions and 0 deletions
--- a/lib/ansible/utils/template.py
+++ b/lib/ansible/utils/template.py
@ -316,6 +316,8 @@ def template_from_string(basedir, data, vars, fail_on_undefined=False):
        except Exception, e:
            if 'recursion' in str(e):
                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:
                return data