saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix diffing binary files in file.get_diff

Browse source
This commit is contained in:
Erik Johnson 2018-04-13 11:25:24 -05:00
parent d6c59696be
commit df6e535f05
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/modules/file.py
View file

@ -4969,9 +4969,8 @@ def get_diff(file1,
args = []
for idx, filename in enumerate(files):
try:
with salt.utils.files.fopen(filename, 'r') as fp_:
args.append([salt.utils.stringutils.to_unicode(x)
for x in fp_.readlines()])
with salt.utils.files.fopen(filename, 'rb') as fp_:
args.append(fp_.readlines())
except (IOError, OSError) as exc:
raise CommandExecutionError(
'Failed to read {0}: {1}'.format(
@ -4991,15 +4990,13 @@ def get_diff(file1,
ret = bdiff
else:
if show_filenames:
args.extend(
[salt.utils.stringutils.to_unicode(x) for x in files]
args.extend(files)
ret = ''.join(
difflib.unified_diff(
*salt.utils.data.decode(args)
)
ret = salt.utils.locales.sdecode(
''.join(difflib.unified_diff(*args)) # pylint: disable=no-value-for-parameter
)
return ret
return ''
return ret
def manage_file(name,