1 This patch from Antti Tapaninen added the --omit-dir-changes option, which
2 tells rsync to not affect any attributes on the directories in the transfer.
4 To use this patch, run these commands for a successful build:
6 patch -p1 <patches/omit-dir-changes.diff
7 ./configure (optional if already run)
12 @@ -43,6 +43,7 @@ extern int preserve_specials;
13 extern int preserve_hard_links;
14 extern int preserve_perms;
15 extern int preserve_times;
16 +extern int omit_dir_changes;
19 extern int delete_mode;
20 @@ -554,6 +555,7 @@ void itemize(const char *fnamecmp, struc
21 int keep_time = !preserve_times ? 0
22 : S_ISDIR(file->mode) ? preserve_times > 1
23 : !S_ISLNK(file->mode);
24 + int omit_changes = omit_dir_changes && S_ISDIR(sxp->st.st_mode);
26 if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size)
27 iflags |= ITEM_REPORT_SIZE;
28 @@ -564,10 +566,11 @@ void itemize(const char *fnamecmp, struc
29 iflags |= ITEM_REPORT_TIME;
30 if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
31 iflags |= ITEM_REPORT_PERMS;
32 - if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
33 + if (uid_ndx && am_root && !omit_changes
34 + && (uid_t)F_OWNER(file) != sxp->st.st_uid)
35 iflags |= ITEM_REPORT_OWNER;
36 - if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
37 - && sxp->st.st_gid != (gid_t)F_GROUP(file))
38 + if (gid_ndx && !omit_changes
39 + && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file))
40 iflags |= ITEM_REPORT_GROUP;
42 if (preserve_acls && !S_ISLNK(file->mode)) {
43 @@ -1246,7 +1249,7 @@ static void recv_generator(char *fname,
45 if (file->flags & FLAG_DIR_CREATED)
47 - if (!preserve_perms) { /* See comment in non-dir code below. */
48 + if (!preserve_perms || omit_dir_changes) { /* See comment in non-dir code below. */
49 file->mode = dest_mode(file->mode, sx.st.st_mode,
50 dflt_perms, statret == 0);
54 @@ -56,6 +56,7 @@ int preserve_specials = 0;
57 int preserve_times = 0;
58 +int omit_dir_changes = 0;
62 @@ -345,6 +346,7 @@ void usage(enum logcode F)
63 rprintf(F," -D same as --devices --specials\n");
64 rprintf(F," -t, --times preserve modification times\n");
65 rprintf(F," -O, --omit-dir-times omit directories from --times\n");
66 + rprintf(F," --omit-dir-changes omit directories any attribute changes\n");
67 rprintf(F," --super receiver attempts super-user activities\n");
69 rprintf(F," --fake-super store/recover privileged attrs using xattrs\n");
70 @@ -482,6 +484,7 @@ static struct poptOption long_options[]
71 {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 },
72 {"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
73 {"no-O", 0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
74 + {"omit-dir-changes", 0, POPT_ARG_NONE, &omit_dir_changes, 0, 0, 0 },
75 {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
76 {"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
77 {"no-super", 0, POPT_ARG_VAL, &am_root, 0, 0, 0 },
78 @@ -1446,6 +1449,8 @@ int parse_arguments(int *argc_p, const c
79 parse_rule(&filter_list, backup_dir_buf, 0, 0);
82 + if (omit_dir_changes)
84 if (make_backups && !backup_dir) {
85 omit_dir_times = 0; /* Implied, so avoid -O to sender. */
86 if (preserve_times > 1)
87 @@ -1681,6 +1686,8 @@ void server_options(char **args, int *ar
91 + if (omit_dir_changes == 1)
92 + args[ac++] = "--omit-dir-changes";
98 @@ -33,6 +33,7 @@ extern int preserve_xattrs;
99 extern int preserve_perms;
100 extern int preserve_executability;
101 extern int preserve_times;
102 +extern int omit_dir_changes;
104 extern int am_server;
105 extern int am_sender;
106 @@ -327,9 +328,11 @@ int set_file_attrs(const char *fname, st
110 - change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
111 + change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file)
112 + && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode));
113 change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
114 - && sxp->st.st_gid != (gid_t)F_GROUP(file);
115 + && sxp->st.st_gid != (gid_t)F_GROUP(file)
116 + && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode));
117 #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
118 if (S_ISLNK(sxp->st.st_mode))