LineageOS/android_external_rsync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

One more tweak to latest omit-dir-times code.

Browse Source
This commit is contained in:
Wayne Davison
2007-09-02 06:25:26 +00:00
parent eb7a6e09cb
commit fbd91cae0c
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
options.c
View File

@@ -1397,9 +1397,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
} }
} }
if (omit_dir_times && preserve_times > 1)
preserve_times = 1;
if (!backup_suffix) if (!backup_suffix)
backup_suffix = backup_dir ? "" : BACKUP_SUFFIX; backup_suffix = backup_dir ? "" : BACKUP_SUFFIX;
backup_suffix_len = strlen(backup_suffix); backup_suffix_len = strlen(backup_suffix);
@@ -1432,8 +1429,15 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
"P *%s", backup_suffix); "P *%s", backup_suffix);
parse_rule(&filter_list, backup_dir_buf, 0, 0); parse_rule(&filter_list, backup_dir_buf, 0, 0);
} }
if (make_backups && !backup_dir && preserve_times > 1)
if (make_backups && !backup_dir) {
omit_dir_times = 0; /* Implied, so avoid -O to sender. */
if (preserve_times > 1)
preserve_times = 1; preserve_times = 1;
} else if (omit_dir_times) {
if (preserve_times > 1)
preserve_times = 1;
}
if (stdout_format) { if (stdout_format) {
if (am_server && log_format_has(stdout_format, 'I')) if (am_server && log_format_has(stdout_format, 'I'))