|
|
@ -95,7 +95,6 @@ class CallbackBase:
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
with warnings.catch_warnings():
|
|
|
|
with warnings.catch_warnings():
|
|
|
|
warnings.simplefilter('ignore')
|
|
|
|
warnings.simplefilter('ignore')
|
|
|
|
ret = []
|
|
|
|
|
|
|
|
if 'dst_binary' in diff:
|
|
|
|
if 'dst_binary' in diff:
|
|
|
|
ret.append("diff skipped: destination file appears to be binary\n")
|
|
|
|
ret.append("diff skipped: destination file appears to be binary\n")
|
|
|
|
if 'src_binary' in diff:
|
|
|
|
if 'src_binary' in diff:
|
|
|
@ -122,9 +121,9 @@ class CallbackBase:
|
|
|
|
ret.append('\n')
|
|
|
|
ret.append('\n')
|
|
|
|
if 'prepared' in diff:
|
|
|
|
if 'prepared' in diff:
|
|
|
|
ret.append(to_unicode(diff['prepared']))
|
|
|
|
ret.append(to_unicode(diff['prepared']))
|
|
|
|
return u"".join(ret)
|
|
|
|
|
|
|
|
except UnicodeDecodeError:
|
|
|
|
except UnicodeDecodeError:
|
|
|
|
ret.append(">> the files are different, but the diff library cannot compare unicode strings\n\n")
|
|
|
|
ret.append(">> the files are different, but the diff library cannot compare unicode strings\n\n")
|
|
|
|
|
|
|
|
return u"".join(ret)
|
|
|
|
|
|
|
|
|
|
|
|
def _get_item(self, result):
|
|
|
|
def _get_item(self, result):
|
|
|
|
if result.get('_ansible_no_log', False):
|
|
|
|
if result.get('_ansible_no_log', False):
|
|
|
|