From: Wayne Davison <wayned@samba.org>
Date: Tue, 30 Aug 2005 02:58:42 +0000 (+0000)
Subject: When --append is entering the redo phase, make sure that
X-Git-Tag: v2.6.7pre1~429
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7ee91defcb1bb9840c55fa8ef24562802ac43ce;p=thirdparty%2Frsync.git

When --append is entering the redo phase, make sure that
sparse_files is disabled (because it conflicts with an
inplace update).
---

diff --git a/receiver.c b/receiver.c
index 46e456e7..4a67c619 100644
--- a/receiver.c
+++ b/receiver.c
@@ -46,6 +46,7 @@ extern int module_id;
 extern int ignore_errors;
 extern int orig_umask;
 extern int append_mode;
+extern int sparse_files;
 extern int keep_partial;
 extern int checksum_seed;
 extern int inplace;
@@ -444,7 +445,10 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
 			send_msg(MSG_DONE, "", 0);
 			if (keep_partial && !partial_dir)
 				make_backups = 0; /* prevents double backup */
-			append_mode = 0;
+			if (append_mode) {
+				append_mode = 0;
+				sparse_files = 0;
+			}
 			continue;
 		}