diff options
author | Wayne Davison <wayned@samba.org> | 2007-09-02 06:25:26 +0000 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2007-09-02 06:25:26 +0000 |
commit | fbd91cae0cadf80229b41ee58394a046974c878c (patch) | |
tree | 2c05be6fbb7c5398f50ff9b080c1d58ec0a506bf /options.c | |
parent | eb7a6e09cba703fdc4687214cb606804061b425f (diff) | |
download | rsync-fbd91cae0cadf80229b41ee58394a046974c878c.tar.gz |
One more tweak to latest omit-dir-times code.
Diffstat (limited to 'options.c')
-rw-r--r-- | options.c | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -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) backup_suffix = backup_dir ? "" : 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); parse_rule(&filter_list, backup_dir_buf, 0, 0); } - if (make_backups && !backup_dir && preserve_times > 1) - 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; + } else if (omit_dir_times) { + if (preserve_times > 1) + preserve_times = 1; + } if (stdout_format) { if (am_server && log_format_has(stdout_format, 'I')) |