ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 11:21:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

make all conditionals lists

Browse source 
this brings them to equivalence with when:
fixes #13905
This commit is contained in:
Brian Coca 2016-03-06 10:47:15 -05:00
parent a52a561217
commit 7067bb32b8
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -452,19 +452,23 @@ class TaskExecutor:
# helper methods for use below in evaluating changed/failed_when
def _evaluate_changed_when_result(result):
if self._task.changed_when is not None:
if self._task.changed_when:
cond = Conditional(loader=self._loader)
cond.when = [ self._task.changed_when ]
cond.when = self._task.changed_when
result['changed'] = cond.evaluate_conditional(templar, vars_copy)
else:
result['changed'] = False
def _evaluate_failed_when_result(result):
if self._task.failed_when is not None:
if self._task.failed_when:
cond = Conditional(loader=self._loader)
cond.when = [ self._task.failed_when ]
cond.when = self._task.failed_when
failed_when_result = cond.evaluate_conditional(templar, vars_copy)
result['failed_when_result'] = result['failed'] = failed_when_result
return failed_when_result
return False
else:
failed_when_result = False
result['failed'] = False
return failed_when_result
if 'ansible_facts' in result:
vars_copy.update(result['ansible_facts'])
@ -482,7 +486,7 @@ class TaskExecutor:
if attempt < retries - 1:
cond = Conditional(loader=self._loader)
cond.when = [ self._task.until ]
cond.when = self._task.until
if cond.evaluate_conditional(templar, vars_copy):
break
else: