The branch, master has been updated
via 0de5157 Tweak dir xattrs after the writability fudging.
from 78286a0 Avoid re-setting (and sending) xattrs on a hard-linked file
w/the same xattrs. Improved the xattrs testing to include hard-linking.
;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0de515756468e0b8f87f3f24ae5351aee8cd3a69
Author: Wayne Davison <way...@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 e3890bb..326ccd8 100644
--- a/generator.c
+++ b/generator.c
@@ -1353,13 +1353,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)
- && INFO_GTE(NAME, 1) && 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.
@@ -1376,6 +1369,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)
+ && INFO_GTE(NAME, 1) && 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.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
