aboutsummaryrefslogtreecommitdiffstats
path: root/delete.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2009-04-10 23:14:06 -0700
committerWayne Davison <wayned@samba.org>2009-04-10 23:14:06 -0700
commit7e6c8ad6534075c93b0b43360a93d4728e52b67f (patch)
tree50cfb7ba30e80a6f8eb5d3d1ef8fa503900e410e /delete.c
parent407ea78a62178a70735910a4d0bba6c650dbb5bc (diff)
downloadandroid_external_rsync-7e6c8ad6534075c93b0b43360a93d4728e52b67f.tar.gz
android_external_rsync-7e6c8ad6534075c93b0b43360a93d4728e52b67f.tar.bz2
android_external_rsync-7e6c8ad6534075c93b0b43360a93d4728e52b67f.zip
Don't try to backup a file being removed from the backup area.
Diffstat (limited to 'delete.c')
-rw-r--r--delete.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/delete.c b/delete.c
index 33fdd0ed..fcdf86bd 100644
--- a/delete.c
+++ b/delete.c
@@ -170,7 +170,7 @@ enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
what = "rmdir";
ok = do_rmdir(fbuf) == 0;
} else {
- if (make_backups > 0 && (backup_dir || !is_backup_file(fbuf))) {
+ if (make_backups > 0 && !(flags & DEL_FOR_BACKUP) && (backup_dir || !is_backup_file(fbuf))) {
what = "make_backup";
ok = make_backup(fbuf, True);
if (ok == 2) {