valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #40629 from aabognah/fix-bug-40167

Browse Source 
Fixing issue # 40167
This commit is contained in:
Mike Place 2017-04-11 16:45:07 -06:00 committed by GitHub
commit 3737289bee
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