Commit 083acd49 authored by Wayne Davison's avatar Wayne Davison

Turn off do_progress during the file-update phase so that

--delete-during and --fuzzy don't get any superfluous
" N files..." lines output in the middle of the processing.
parent 00348fd7
...@@ -31,6 +31,7 @@ extern int daemon_log_format_has_i; ...@@ -31,6 +31,7 @@ extern int daemon_log_format_has_i;
extern int am_root; extern int am_root;
extern int am_server; extern int am_server;
extern int am_daemon; extern int am_daemon;
extern int do_progress;
extern int recurse; extern int recurse;
extern int relative_paths; extern int relative_paths;
extern int keep_dirlinks; extern int keep_dirlinks;
...@@ -1112,6 +1113,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) ...@@ -1112,6 +1113,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
int need_retouch_dir_perms = 0; int need_retouch_dir_perms = 0;
int save_only_existing = only_existing; int save_only_existing = only_existing;
int save_opt_ignore_existing = opt_ignore_existing; int save_opt_ignore_existing = opt_ignore_existing;
int save_do_progress = do_progress;
allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2; allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2;
lull_mod = allowed_lull * 5; lull_mod = allowed_lull * 5;
...@@ -1141,6 +1143,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) ...@@ -1141,6 +1143,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
if (delete_before && !local_name && flist->count > 0) if (delete_before && !local_name && flist->count > 0)
do_delete_pass(flist); do_delete_pass(flist);
do_progress = 0;
if (whole_file < 0) if (whole_file < 0)
whole_file = 0; whole_file = 0;
...@@ -1238,6 +1241,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) ...@@ -1238,6 +1241,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
get_redo_num(itemizing, code); get_redo_num(itemizing, code);
} }
do_progress = save_do_progress;
if (delete_after && !local_name && flist->count > 0) if (delete_after && !local_name && flist->count > 0)
do_delete_pass(flist); do_delete_pass(flist);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment