From 083acd496d10420bbb64df3f62e400254960988f Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Tue, 29 Mar 2005 10:41:26 +0000
Subject: [PATCH] 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.

---
 generator.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/generator.c b/generator.c
index b9197c71..91d0402e 100644
--- a/generator.c
+++ b/generator.c
@@ -31,6 +31,7 @@ extern int daemon_log_format_has_i;
 extern int am_root;
 extern int am_server;
 extern int am_daemon;
+extern int do_progress;
 extern int recurse;
 extern int relative_paths;
 extern int keep_dirlinks;
@@ -1112,6 +1113,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 	int need_retouch_dir_perms = 0;
 	int save_only_existing = only_existing;
 	int save_opt_ignore_existing = opt_ignore_existing;
+	int save_do_progress = do_progress;
 
 	allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2;
 	lull_mod = allowed_lull * 5;
@@ -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)
 		do_delete_pass(flist);
+	do_progress = 0;
 
 	if (whole_file < 0)
 		whole_file = 0;
@@ -1238,6 +1241,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 		get_redo_num(itemizing, code);
 	}
 
+	do_progress = save_do_progress;
 	if (delete_after && !local_name && flist->count > 0)
 		do_delete_pass(flist);
 
-- 
2.34.1