Fix error when display_ok_hosts is false
If display_ok_hosts is false, we were returning None but the function is expected to return a tuple. So let's return a tuple of (None, None) and check if we don't have a line then return. Change-Id: Iaf2f83a8f13bcb9cf0c37acff627a456005057de
This commit is contained in:
parent
41f132edb5
commit
3ff730bc6f
|
@ -73,7 +73,7 @@ class CallbackModule(DefaultCallback):
|
||||||
color = C.COLOR_CHANGED
|
color = C.COLOR_CHANGED
|
||||||
else:
|
else:
|
||||||
if not self.display_ok_hosts:
|
if not self.display_ok_hosts:
|
||||||
return
|
return (None, None)
|
||||||
line.append(self._get_state('OK'))
|
line.append(self._get_state('OK'))
|
||||||
line.append(self._get_task_name(result))
|
line.append(self._get_task_name(result))
|
||||||
line.append(host_str)
|
line.append(host_str)
|
||||||
|
@ -147,6 +147,8 @@ class CallbackModule(DefaultCallback):
|
||||||
if isinstance(result._task, TaskInclude):
|
if isinstance(result._task, TaskInclude):
|
||||||
return
|
return
|
||||||
(line, color) = self._get_item_line(result, item=True)
|
(line, color) = self._get_item_line(result, item=True)
|
||||||
|
if not line:
|
||||||
|
return
|
||||||
self._handle_warnings(result._result)
|
self._handle_warnings(result._result)
|
||||||
if result._task.loop and 'results' in result._result:
|
if result._task.loop and 'results' in result._result:
|
||||||
self._process_items(result)
|
self._process_items(result)
|
||||||
|
@ -202,6 +204,8 @@ class CallbackModule(DefaultCallback):
|
||||||
if isinstance(result._task, TaskInclude):
|
if isinstance(result._task, TaskInclude):
|
||||||
return
|
return
|
||||||
(line, color) = self._get_item_line(result)
|
(line, color) = self._get_item_line(result)
|
||||||
|
if not line:
|
||||||
|
return
|
||||||
self._handle_warnings(result._result)
|
self._handle_warnings(result._result)
|
||||||
if result._task.loop and 'results' in result._result:
|
if result._task.loop and 'results' in result._result:
|
||||||
self._process_items(result)
|
self._process_items(result)
|
||||||
|
|
Loading…
Reference in New Issue