updated callbacks to properly test diff no matter if dict or list

9 years ago · 861fdfc5ba
parent 79ea6d3a1e
commit 861fdfc5ba
3 changed files with 3 additions and 3 deletions
--- a/lib/ansible/plugins/callback/default.py
+++ b/lib/ansible/plugins/callback/default.py
@ -110,7 +110,7 @@ class CallbackModule(CallbackBase):
        self._display.banner(msg)

    def v2_on_file_diff(self, result):
-        if 'diff' in result._result and result._result['diff'] != {}:
+        if 'diff' in result._result and result._result['diff']:
            self._display.display(self._get_diff(result._result['diff']))

    def v2_playbook_item_on_ok(self, result):
--- a/lib/ansible/plugins/callback/minimal.py
+++ b/lib/ansible/plugins/callback/minimal.py
@ -77,5 +77,5 @@ class CallbackModule(CallbackBase):
        self._display.display("%s | UNREACHABLE!" % result._host.get_name(), color='yellow')

    def v2_on_file_diff(self, result):
-        if 'diff' in result._result and result._result['diff'] != {}:
+        if 'diff' in result._result and result._result['diff']:
            self._display.display(self._get_diff(result._result['diff']))
--- a/lib/ansible/plugins/callback/skippy.py
+++ b/lib/ansible/plugins/callback/skippy.py
@ -103,7 +103,7 @@ class CallbackModule(CallbackBase):
        self._display.banner(msg)

    def v2_on_file_diff(self, result):
-        if 'diff' in result._result and result._result['diff'] != {}:
+        if 'diff' in result._result and result._result['diff']:
            self._display.display(self._get_diff(result._result['diff']))

    def v2_playbook_item_on_ok(self, result):