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

Merge pull request #47046 from clan/file_diff

Browse source 
switch order of file to be diffed
This commit is contained in:
Nicole Thomas 2018-04-13 09:40:12 -04:00 • committed by GitHub
commit d5afa4a2c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/file.py
View file

@ -4812,7 +4812,7 @@ def check_file_meta(
if sfn:
try:
changes['diff'] = get_diff(
sfn, name, template=True, show_filenames=False)
name, sfn, template=True, show_filenames=False)
except CommandExecutionError as exc:
changes['diff'] = exc.strerror
else: