only do squash when 'squashable field' present

pull/14740/head
Brian Coca 9 years ago
parent 18240d350c
commit 71402abf21

@ -279,6 +279,7 @@ class TaskExecutor:
# This gets the information to check whether the name field
# contains a template that we can squash for
template_no_item = template_with_item = None
if name:
if templar._contains_vars(name):
variables['item'] = '\0$'
template_no_item = templar.template(name, variables, cache=False)
@ -289,7 +290,7 @@ class TaskExecutor:
# Check if the user is doing some operation that doesn't take
# name/pkg or the name/pkg field doesn't have any variables
# and thus the items can't be squashed
if name and (template_no_item != template_with_item):
if template_no_item != template_with_item:
for item in items:
variables['item'] = item
if self._task.evaluate_conditional(templar, variables):

Loading…
Cancel
Save