ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-27 23:21:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Do not insert newlines when diff is empty

Browse source
This commit is contained in:
Tobias Wolf 2016-02-03 16:14:22 +01:00
commit 28169492f9
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/plugins/callback/__init__.py
View file

@ -127,14 +127,22 @@ class CallbackBase:
after_header = "after: %s" % diff['after_header'] after_header = "after: %s" % diff['after_header']
else: else:
after_header = 'after' after_header = 'after'
differ = difflib.unified_diff(to_unicode(diff['before']).splitlines(True), to_unicode(diff['after']).splitlines(True), before_header, after_header, '', '', 10) differ = difflib.unified_diff(to_unicode(diff['before']).splitlines(True),
ret.extend(list(differ)) to_unicode(diff['after']).splitlines(True),
ret.append('\n') fromfile=before_header,
tofile=after_header,
fromfiledate='',
tofiledate='',
n=10)
difflines = list(differ)
if difflines:
ret.extend(difflines)
ret.append('\n')
if 'prepared' in diff: if 'prepared' in diff:
ret.append(to_unicode(diff['prepared'])) ret.append(to_unicode(diff['prepared']))
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) 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):