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

Check for name or pkg when templating squashed items. Fixes #11430

Browse source
This commit is contained in:
Matt Martz 2015-06-30 10:13:40 -05:00
parent a75e62b6e1
commit 65fdcf8b9d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/executor/task_executor.py
View file

@ -179,15 +179,15 @@ class TaskExecutor:
Squash items down to a comma-separated list for certain modules which support it Squash items down to a comma-separated list for certain modules which support it
(typically package management modules). (typically package management modules).
''' '''
if len(items) > 0 and self._task.action in self.SQUASH_ACTIONS: if len(items) > 0 and self._task.action in self.SQUASH_ACTIONS:
final_items = [] final_items = []
for item in items: for item in items:
variables['item'] = item variables['item'] = item
templar = Templar(loader=self._loader, shared_loader_obj=self._shared_loader_obj, variables=variables) templar = Templar(loader=self._loader, shared_loader_obj=self._shared_loader_obj, variables=variables)
if self._task.evaluate_conditional(templar, variables): if self._task.evaluate_conditional(templar, variables):
if templar._contains_vars(self._task.args['name']): name = self._task.args.pop('name', None) or self._task.args.pop('pkg', None)
new_item = templar.template(self._task.args['name']) if templar._contains_vars(name):
new_item = templar.template(name)
final_items.append(new_item) final_items.append(new_item)
else: else:
final_items.append(item) final_items.append(item)