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

reworded conditional skipping to not imply error

Browse source 
fixes
This commit is contained in:
Brian Coca 2017-01-31 13:32:51 -05:00
parent 039d207d24
commit e6f92bc3a9
1 changed files with 2 additions and 2 deletions

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

@ -407,8 +407,8 @@ class TaskExecutor:
# variable not being present which would otherwise cause validation to fail
try:
if not self._task.evaluate_conditional(templar, variables):
display.debug("when evaluation failed, skipping this task")
return dict(changed=False, skipped=True, skip_reason='Conditional check failed', _ansible_no_log=self._play_context.no_log)
display.debug("when evaluation is False, skipping this task")
return dict(changed=False, skipped=True, skip_reason='Conditional result was False', _ansible_no_log=self._play_context.no_log)
except AnsibleError:
# loop error takes precedence
if self._loop_eval_error is not None: