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

Fixing issue # 40167 with file.replace where the diff output does not

Browse source 
display correctly.
This commit is contained in:
Anas Abognah 2017-04-11 10:26:12 -04:00
parent b0a2414d68
commit 28f7744cb6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/file.py
View file

@ -2231,8 +2231,8 @@ def replace(path,
check_perms(path, None, pre_user, pre_group, pre_mode)
if show_changes:
orig_file_as_str = ''.join([salt.utils.to_str(x) for x in orig_file])
new_file_as_str = ''.join([salt.utils.to_str(x) for x in new_file])
orig_file_as_str = [salt.utils.to_str(x) for x in orig_file]
new_file_as_str = [salt.utils.to_str(x) for x in new_file]
return ''.join(difflib.unified_diff(orig_file_as_str, new_file_as_str))
return has_changes