From: Wayne Davison <wayned@samba.org>
Date: Sat, 26 Mar 2011 17:17:14 +0000 (-0700)
Subject: Tweak dir xattrs after the writability fudging.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/0de515756468e0b8f87f3f24ae5351aee8cd3a69

Tweak dir xattrs after the writability fudging.
---

diff --git a/generator.c b/generator.c
index e3890bb1..326ccd88 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) {