summaryrefslogtreecommitdiff
path: root/receiver.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2005-01-23 07:27:01 +0000
committerWayne Davison <wayned@samba.org>2005-01-23 07:27:01 +0000
commitb98f040ef25bc692ad3864244eed620611f79048 (patch)
tree0fa986b612b0c2ffd91cb0f6517a94e5e38a6d39 /receiver.c
parente57211c544a0171e54cb6e1ccf30355c060a68a3 (diff)
downloadrsync-b98f040ef25bc692ad3864244eed620611f79048.tar.gz
rsync-b98f040ef25bc692ad3864244eed620611f79048.tar.bz2
rsync-b98f040ef25bc692ad3864244eed620611f79048.zip
Go back to requiring -r for deletes to happen.
Diffstat (limited to 'receiver.c')
-rw-r--r--receiver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/receiver.c b/receiver.c
index 76508bf3..bb3097a7 100644
--- a/receiver.c
+++ b/receiver.c
@@ -21,6 +21,7 @@
#include "rsync.h"
extern int verbose;
+extern int recurse;
extern int delete_after;
extern int max_delete;
extern int csum_length;
@@ -31,7 +32,6 @@ extern int batch_gen_fd;
extern int am_server;
extern int protocol_version;
extern int relative_paths;
-extern int keep_dirs;
extern int keep_dirlinks;
extern int preserve_hard_links;
extern int preserve_perms;
@@ -600,7 +600,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
}
make_backups = save_make_backups;
- if (delete_after && keep_dirs && !local_name && flist->count > 0)
+ if (delete_after && recurse && !local_name && flist->count > 0)
delete_files(flist);
if (verbose > 2)