Merge pull request #2107 from FireHost/fix_file_managed_diff

Fix reversed diff on file.managed
2024-11-08 09:23:56 +00:00 · 2012-09-26 19:29:47 -07:00 · 2012-09-26 19:29:47 -07:00 · 06e3f4035b
commit 06e3f4035b
parent 40002fae22 4013bfeeb0
1 changed files with 2 additions and 2 deletions
--- a/salt/states/file.py
+++ b/salt/states/file.py
@ -1106,8 +1106,8 @@ def managed(name,
                    nlines = name_.readlines()
                # Print a diff equivalent to diff -u old new
                    ret['changes']['diff'] = (''.join(difflib
-                                                      .unified_diff(slines,
-                                                                    nlines)))
+                                                      .unified_diff(nlines,
+                                                                    slines)))
            # Pre requisites are met, and the file needs to be replaced, do it
            try:
                salt.utils.copyfile(