Fixed several issues with preserving xattrs when using --backup.

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 48894c9..9921da0 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -561,8 +561,11 @@ int finish_transfer(const char *fname, const char *fnametmp,
                goto do_set_file_attrs;
        }
 
                goto do_set_file_attrs;
        }
 

-       if (make_backups > 0 && overwriting_basis && !make_backup(fname))
-               return 1;
+       if (make_backups > 0 && overwriting_basis) {
+               if (!make_backup(fname))
+                       return 1;
+               fnamecmp = get_backup_name(fname);
+       }

 
        /* Change permissions before putting the file into place. */
        set_file_attrs(fnametmp, file, NULL, fnamecmp,
 
        /* Change permissions before putting the file into place. */
        set_file_attrs(fnametmp, file, NULL, fnamecmp,