Skip to content

Commit

Permalink
reworded conditional skipping to not imply error
Browse files Browse the repository at this point in the history
  • Loading branch information
bcoca committed Jan 31, 2017
1 parent 039d207 commit e6f92bc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/ansible/executor/task_executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -407,8 +407,8 @@ def _execute(self, variables=None):
# 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:
Expand Down

0 comments on commit e6f92bc

Please sign in to comment.