[SCM] The rsync repository. - branch b3.0.x updated

[Rsync CVS commit messages]

The branch, b3.0.x has been updated
       via  959bd70 Tweak dir xattrs after the writability fudging.
      from  a7271fb Avoid re-setting xattrs on a hard-linked file w/the same xattrs. Improved the xattrs testing to include hard-linking.

;a=shortlog;h=b3.0.x


- Log -----------------------------------------------------------------
commit 959bd708209d6cbb9c9c7aa34de7b8f9423da0de
Author: Wayne Davison <wayned at samba.org>
Date:   Sat Mar 26 10:17:14 2011 -0700

    Tweak dir xattrs after the writability fudging.

-----------------------------------------------------------------------

Summary of changes:
 generator.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/generator.c b/generator.c
index b914ddf..4f74597 100644
--- a/generator.c
+++ b/generator.c
@@ -1522,13 +1522,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				goto cleanup;
 			}
 		}
-#ifdef SUPPORT_XATTRS
-		if (preserve_xattrs && statret == 1)
-			copy_xattrs(fnamecmpbuf, fname);
-#endif
-		if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, NULL, 0)
-		    && verbose && code != FNONE && f_out != -1)
-			rprintf(code, "%s/\n", fname);
 
 		/* We need to ensure that the dirs in the transfer have writable
 		 * permissions during the time we are putting files within them.
@@ -1545,6 +1538,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		}
 #endif
 
+#ifdef SUPPORT_XATTRS
+		if (preserve_xattrs && statret == 1)
+			copy_xattrs(fnamecmpbuf, fname);
+#endif
+		if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, NULL, 0)
+		    && verbose && code != FNONE && f_out != -1)
+			rprintf(code, "%s/\n", fname);
+
 		if (real_ret != 0 && one_file_system)
 			real_sx.st.st_dev = filesystem_dev;
 		if (inc_recurse) {


-- 
The rsync repository.