From f845ef7decf84b4deb87e2c7b8c4c24e1516cf02 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Thu, 28 Dec 2006 19:02:01 +0000
Subject: [PATCH] An incremental-recursion transfer can't switch from
 delete-delay to delete-after.

---
 generator.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generator.c b/generator.c
index e1a85cb1..633ac5a8 100644
--- a/generator.c
+++ b/generator.c
@@ -282,10 +282,10 @@ static int start_delete_delay_temp(void)
 	dry_run = 0;
 	if (!get_tmpname(fnametmp, "deldelay")
 	 || (deldelay_fd = do_mkstemp(fnametmp, 0600)) < 0) {
-		rprintf(FINFO, "NOTE: Unable to create delete-delay temp file--"
-			"switching to --delete-after.\n");
+		rprintf(FINFO, "NOTE: Unable to create delete-delay temp file%s.\n",
+			incremental ? "" : " -- switching to --delete-after");
 		delete_during = 0;
-		delete_after = 1;
+		delete_after = !incremental;
 		dry_run = save_dry_run;
 		return 0;
 	}
-- 
2.34.1