From 3cd7d47b7ec2a8a560c6da803768eb3d9983c252 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Fri, 7 Mar 2014 14:36:54 -0600 Subject: [PATCH] Correctly catch template errors without returning invalid data Fixes #6329 --- lib/ansible/utils/template.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/ansible/utils/template.py b/lib/ansible/utils/template.py index fc4ff9fd204..e58543c411f 100644 --- 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