This patch from Antti Tapaninen added the --omit-dir-changes option, which tells rsync to not affect any attributes on the directories in the transfer. To use this patch, run these commands for a successful build: patch -p1 st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) iflags |= ITEM_REPORT_PERMS; - if (preserve_uid && am_root && F_UID(file) != st->st_uid) + if (preserve_uid && am_root && F_UID(file) != st->st_uid + && !(omit_dir_changes && S_ISDIR(st->st_mode))) iflags |= ITEM_REPORT_OWNER; - if (preserve_gid && F_GID(file) != GID_NONE - && st->st_gid != F_GID(file)) + if (preserve_gid && F_GID(file) != GID_NONE && st->st_gid != F_GID(file) + && !(omit_dir_changes && S_ISDIR(st->st_mode))) iflags |= ITEM_REPORT_GROUP; } else iflags |= ITEM_IS_NEW; @@ -1169,7 +1171,7 @@ static void recv_generator(char *fname, /* If we're not preserving permissions, change the file-list's * mode based on the local permissions and some heuristics. */ - if (!preserve_perms) { + if (!preserve_perms || (omit_dir_changes && S_ISDIR(st.st_mode))) { int exists = statret == 0 && S_ISDIR(st.st_mode) == S_ISDIR(file->mode); file->mode = dest_mode(file->mode, st.st_mode, exists); --- old/options.c +++ new/options.c @@ -55,6 +55,7 @@ int preserve_uid = 0; int preserve_gid = 0; int preserve_times = 0; int omit_dir_times = 0; +int omit_dir_changes = 0; int update_only = 0; int cvs_exclude = 0; int dry_run = 0; @@ -309,6 +310,7 @@ void usage(enum logcode F) rprintf(F," -D same as --devices --specials\n"); rprintf(F," -t, --times preserve times\n"); rprintf(F," -O, --omit-dir-times omit directories when preserving times\n"); + rprintf(F," --omit-dir-changes omit directories when preserving any attributes\n"); rprintf(F," --super receiver attempts super-user activities\n"); rprintf(F," -S, --sparse handle sparse files efficiently\n"); rprintf(F," -n, --dry-run show what would have been transferred\n"); @@ -426,6 +428,7 @@ static struct poptOption long_options[] {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 }, + {"omit-dir-changes", 0, POPT_ARG_NONE, &omit_dir_changes, 0, 0, 0 }, {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 }, {"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 }, {"no-super", 0, POPT_ARG_VAL, &am_root, 0, 0, 0 }, @@ -1286,6 +1289,9 @@ int parse_arguments(int *argc, const cha "P *%s", backup_suffix); parse_rule(&filter_list, backup_dir_buf, 0, 0); } + + if (omit_dir_changes) + omit_dir_times = 2; if (make_backups && !backup_dir) omit_dir_times = 1; @@ -1519,6 +1525,8 @@ void server_options(char **args,int *arg argstr[x++] = 'm'; if (omit_dir_times == 2) argstr[x++] = 'O'; + if (omit_dir_changes == 1) + args[ac++] = "--omit-dir-changes"; } else { if (copy_links) argstr[x++] = 'L'; --- old/receiver.c +++ new/receiver.c @@ -37,6 +37,7 @@ extern int protocol_version; extern int relative_paths; extern int preserve_hard_links; extern int preserve_perms; +extern int omit_dir_changes; extern int basis_dir_cnt; extern int make_backups; extern int cleanup_got_literal; @@ -543,7 +544,7 @@ int recv_files(int f_in, struct file_lis /* If we're not preserving permissions, change the file-list's * mode based on the local permissions and some heuristics. */ - if (!preserve_perms) { + if (!preserve_perms || (omit_dir_changes && S_ISDIR(st.st_mode))) { int exists = fd1 != -1; file->mode = dest_mode(file->mode, st.st_mode, exists); } --- old/rsync.c +++ new/rsync.c @@ -36,6 +36,7 @@ extern int preserve_perms; extern int preserve_executability; extern int preserve_times; extern int omit_dir_times; +extern int omit_dir_changes; extern int am_root; extern int am_server; extern int am_sender; @@ -215,9 +216,11 @@ int set_file_attrs(char *fname, struct f updated = 1; } - change_uid = am_root && preserve_uid && st->st_uid != F_UID(file); + change_uid = am_root && preserve_uid && st->st_uid != F_UID(file) + && !(omit_dir_changes && S_ISDIR(st->st_mode)); change_gid = preserve_gid && F_GID(file) != GID_NONE - && st->st_gid != F_GID(file); + && st->st_gid != F_GID(file) + && !(omit_dir_changes && S_ISDIR(st->st_mode)); #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK if (S_ISLNK(st->st_mode)) ;