summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2013-09-13 13:52:58 -0500
committerJames Cammarata <jimi@sngx.net>2013-09-13 13:52:58 -0500
commit35d138a0d6642536d63926b74260c0ebb8aee441 (patch)
tree4cfa1fb6641cf170cae6229547677802a35840e7
parentd2bf244eb88b710aac85d1d08973ea04219075ff (diff)
downloadansible-35d138a0d6642536d63926b74260c0ebb8aee441.tar.gz
When checking conditionals, don't dereference when the variable contains dashes
Fixes #4104
-rw-r--r--lib/ansible/utils/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/utils/__init__.py b/lib/ansible/utils/__init__.py
index b4b8b24ed3..fd97f8a142 100644
--- a/lib/ansible/utils/__init__.py
+++ b/lib/ansible/utils/__init__.py
@@ -164,7 +164,7 @@ def check_conditional(conditional, basedir, inject, fail_on_undefined=False, jin
if conditional.startswith("jinja2_compare"):
conditional = conditional.replace("jinja2_compare ","")
# allow variable names
- if conditional in inject:
+ if conditional in inject and str(inject[conditional]).find('-') == -1:
conditional = inject[conditional]
conditional = template.template(basedir, conditional, inject, fail_on_undefined=fail_on_undefined)
# a Jinja2 evaluation that results in something Python can eval!