cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Re-implement lookup wantlist

Browse source 
Fixes #13285
This commit is contained in:
James Cammarata 2015-11-29 23:45:14 -05:00
parent bb52b45ea0
commit 2db3f12027
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/template/__init__.py
View file

@ -391,6 +391,8 @@ class Templar:
instance = self._lookup_loader.get(name.lower(), loader=self._loader, templar=self) instance = self._lookup_loader.get(name.lower(), loader=self._loader, templar=self)
if instance is not None: if instance is not None:
wantlist = kwargs.pop('wantlist', False)
from ansible.utils.listify import listify_lookup_plugin_terms from ansible.utils.listify import listify_lookup_plugin_terms
loop_terms = listify_lookup_plugin_terms(terms=args, templar=self, loader=self._loader, fail_on_undefined=True, convert_bare=False) loop_terms = listify_lookup_plugin_terms(terms=args, templar=self, loader=self._loader, fail_on_undefined=True, convert_bare=False)
# safely catch run failures per #5059 # safely catch run failures per #5059
@ -404,8 +406,11 @@ class Templar:
ran = None ran = None
if ran: if ran:
from ansible.vars.unsafe_proxy import UnsafeProxy from ansible.vars.unsafe_proxy import UnsafeProxy, wrap_var
ran = UnsafeProxy(",".join(ran)) if wantlist:
ran = wrap_var(ran)
else:
ran = UnsafeProxy(",".join(ran))
return ran return ran
else: else: