From: Wayne Davison <wayned@samba.org>
Date: Sat, 29 Jan 2005 22:35:47 +0000 (+0000)
Subject: Tweaked check in front of delete_files() call.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/864146de58bec34fe8b0e61467907419628838b9

Tweaked check in front of delete_files() call.
---

diff --git a/main.c b/main.c
index b4cb90af..f48febe8 100644
--- a/main.c
+++ b/main.c
@@ -34,7 +34,6 @@ extern int blocking_io;
 extern int cvs_exclude;
 extern int delete_mode;
 extern int delete_before;
-extern int delete_after;
 extern int delete_excluded;
 extern int daemon_over_rsh;
 extern int do_stats;
@@ -501,10 +500,9 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 	if (preserve_hard_links)
 		init_hard_links(flist);
 
-	if (delete_before) {
-		/* I moved this here from recv_files() to prevent a race condition */
-		if (recurse && !local_name && flist->count > 0)
-			delete_files(flist);
+	if (delete_before && !local_name && flist->count > 0) {
+		/* Moved here from recv_files() to prevent a race condition */
+		delete_files(flist);
 	}
 
 	if (fd_pair(error_pipe) < 0