Make more lookup plugins tolerant of new variable system, with a little better 'do what I mean' logic to resolving

what happens if you get a string back as a template result.
This commit is contained in:
Michael DeHaan 2013-04-16 19:07:19 -04:00
parent c0f8af5202
commit 86d47bce5f
11 changed files with 51 additions and 33 deletions

View file

@ -725,7 +725,11 @@ def listify_lookup_plugin_terms(terms, basedir, inject):
if not '{' in terms and not '[' in terms and not terms.strip().startswith("/"):
try:
terms = template.template(basedir, "{{ %s }}" % terms, inject)
new_terms = template.template(basedir, "{{ %s }}" % terms, inject)
if isinstance(new_terms, basestring) and new_terms.find("{{") != -1:
pass
else:
terms = new_terms
except:
pass