Merge "Fix error when display_ok_hosts is false" into stable/train

This commit is contained in:
Zuul 2020-06-10 17:42:51 +00:00 committed by Gerrit Code Review
commit ed70d44b62
1 changed files with 5 additions and 1 deletions

View File

@ -72,7 +72,7 @@ class CallbackModule(DefaultCallback):
color = C.COLOR_CHANGED
else:
if not self.display_ok_hosts:
return
return (None, None)
line.append(self._get_state('OK'))
line.append(self._get_task_name(result))
line.append(host_str)
@ -146,6 +146,8 @@ class CallbackModule(DefaultCallback):
if isinstance(result._task, TaskInclude):
return
(line, color) = self._get_item_line(result, item=True)
if not line:
return
self._handle_warnings(result._result)
if result._task.loop and 'results' in result._result:
self._process_items(result)
@ -201,6 +203,8 @@ class CallbackModule(DefaultCallback):
if isinstance(result._task, TaskInclude):
return
(line, color) = self._get_item_line(result)
if not line:
return
self._handle_warnings(result._result)
if result._task.loop and 'results' in result._result:
self._process_items(result)