wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix handling of difflist containing multiple before/after pairs

Browse source 
Commit ansible/ansible@c337293 introduced a difflist feature. The return
value was not adequately outdented to append any diff after the first.
This commit is contained in:
Tobias Wolf 2016-01-27 14:04:07 +01:00
parent 5cd3f71792
commit 67594e8ec2
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -106,7 +106,6 @@ class CallbackBase:
try:
with warnings.catch_warnings():
warnings.simplefilter('ignore')
ret = []
if 'dst_binary' in diff:
ret.append("diff skipped: destination file appears to be binary\n")
if 'src_binary' in diff:
@ -133,9 +132,9 @@ class CallbackBase:
ret.append('\n')
if 'prepared' in diff:
ret.append(to_unicode(diff['prepared']))
return u"".join(ret)
except UnicodeDecodeError:
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):
if result.get('_ansible_no_log', False):