aboutsummaryrefslogtreecommitdiffstats
path: root/receiver.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2005-08-30 02:58:42 +0000
committerWayne Davison <wayned@samba.org>2005-08-30 02:58:42 +0000
commite7ee91defcb1bb9840c55fa8ef24562802ac43ce (patch)
tree1c67e708ca46cbaed64052ad9de19a860573e93e /receiver.c
parentcfce9f6dc353a013ab8d07c20a392aeaf6cab5ea (diff)
downloadandroid_external_rsync-e7ee91defcb1bb9840c55fa8ef24562802ac43ce.tar.gz
android_external_rsync-e7ee91defcb1bb9840c55fa8ef24562802ac43ce.tar.bz2
android_external_rsync-e7ee91defcb1bb9840c55fa8ef24562802ac43ce.zip
When --append is entering the redo phase, make sure that
sparse_files is disabled (because it conflicts with an inplace update).
Diffstat (limited to 'receiver.c')
-rw-r--r--receiver.c6
1 files changed, 5 insertions, 1 deletions
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;
}