From: Wayne Davison Date: Tue, 14 Feb 2006 19:27:45 +0000 (+0000) Subject: Fixed a failing hunk. X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/ae6834e1aefbc83e4777852d8ddd2fb9e9ec2b12 Fixed a failing hunk. --- diff --git a/acls.diff b/acls.diff index 2ba5425..01b43b7 100644 --- a/acls.diff +++ b/acls.diff @@ -1382,7 +1382,7 @@ ACLs to a non-ACL-supporting disk should complain. + RECEIVE_ACL(file, f); + - if (S_ISREG(file->mode)) + if (S_ISREG(file->mode) || S_ISLNK(file->mode)) stats.total_size += file->length; @@ -1388,6 +1396,8 @@ struct file_list *recv_file_list(int f) @@ -4994,7 +4994,7 @@ ACLs to a non-ACL-supporting disk should complain. --chmod=CHMOD change destination permissions -o, --owner preserve owner (super-user only) -g, --group preserve group -@@ -691,7 +692,9 @@ quote(itemize( +@@ -693,7 +694,9 @@ quote(itemize( permissions, though the bf(--executability) option might change just the execute permission for the file. it() New files get their "normal" permission bits set to the source @@ -5005,7 +5005,7 @@ ACLs to a non-ACL-supporting disk should complain. their special permission bits disabled except in the case where a new directory inherits a setgid bit from its parent directory. )) -@@ -722,9 +725,11 @@ The preservation of the destination's se +@@ -724,9 +727,11 @@ The preservation of the destination's se directories when bf(--perms) is off was added in rsync 2.6.7. Older rsync versions erroneously preserved the three special permission bits for newly-created files when bf(--perms) was off, while overriding the @@ -5020,7 +5020,7 @@ ACLs to a non-ACL-supporting disk should complain. dit(bf(-E, --executability)) This option causes rsync to preserve the executability (or non-executability) of regular files when bf(--perms) is -@@ -742,6 +747,10 @@ quote(itemize( +@@ -744,6 +749,10 @@ quote(itemize( If bf(--perms) is enabled, this option is ignored.