diff options
author | Wayne Davison <wayned@samba.org> | 2005-01-23 07:27:01 +0000 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2005-01-23 07:27:01 +0000 |
commit | b98f040ef25bc692ad3864244eed620611f79048 (patch) | |
tree | 0fa986b612b0c2ffd91cb0f6517a94e5e38a6d39 /receiver.c | |
parent | e57211c544a0171e54cb6e1ccf30355c060a68a3 (diff) | |
download | rsync-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.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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) |