Commit 078aaa95 by James Tanner

Revert 1f6edf7d and re-enable passing lists to yum and apt

parent e35c54b5
...@@ -457,12 +457,10 @@ class Runner(object): ...@@ -457,12 +457,10 @@ class Runner(object):
if type(items) != list: if type(items) != list:
raise errors.AnsibleError("lookup plugins have to return a list: %r" % items) raise errors.AnsibleError("lookup plugins have to return a list: %r" % items)
# hack for apt, yum, and pkgng so that with_items maps back into a single module call
if len(items) and utils.is_list_of_strings(items) and self.module_name in [ 'apt', 'yum', 'pkgng' ]: if len(items) and utils.is_list_of_strings(items) and self.module_name in [ 'apt', 'yum', 'pkgng' ]:
# only join the item/package names if this task is not conditional # hack for apt, yum, and pkgng so that with_items maps back into a single module call
if not self.conditional: inject['item'] = ",".join(items)
inject['item'] = ",".join(items) items = None
items = None
# logic to replace complex args if possible # logic to replace complex args if possible
complex_args = self.complex_args complex_args = self.complex_args
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment