summaryrefslogtreecommitdiff
path: root/lib/ansible/executor
diff options
context:
space:
mode:
authorBrian Coca <brian.coca+git@gmail.com>2017-01-31 13:32:51 -0500
committerBrian Coca <brian.coca+git@gmail.com>2017-01-31 13:33:29 -0500
commite6f92bc3a937d8ca9593f0c973ff491779b24c93 (patch)
tree75ee5d208ac6217304e06fc3876d48ba72d190e3 /lib/ansible/executor
parent039d207d2471df56c55fb2b1097a56aaab18da0a (diff)
downloadansible-e6f92bc3a937d8ca9593f0c973ff491779b24c93.tar.gz
reworded conditional skipping to not imply error
fixes #19068
Diffstat (limited to 'lib/ansible/executor')
-rw-r--r--lib/ansible/executor/task_executor.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py
index 7c710e6543..2488fa7471 100644
--- a/lib/ansible/executor/task_executor.py
+++ b/lib/ansible/executor/task_executor.py
@@ -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: