Merge pull request #2705 from b6d/utils-fix

Fix if-statement that always evaluates True
This commit is contained in:
Michael DeHaan 2013-04-17 11:13:58 -07:00
commit 6544af9616

View file

@ -732,7 +732,7 @@ def listify_lookup_plugin_terms(terms, basedir, inject):
except:
pass
if '{' or '[' in terms:
if '{' in terms or '[' in terms:
# Jinja2 already evaluated a variable to a list.
# Jinja2-ified list needs to be converted back to a real type
# TODO: something a bit less heavy than eval