summaryrefslogtreecommitdiff
path: root/rsync.c
diff options
context:
space:
mode:
Diffstat (limited to 'rsync.c')
-rw-r--r--rsync.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/rsync.c b/rsync.c
index 576ce63f..1ddb54f3 100644
--- a/rsync.c
+++ b/rsync.c
@@ -76,7 +76,8 @@ int delete_file(char *fname, int flags)
return -1;
}
- zap_dir = flags & DEL_RECURSE || (force_delete && recurse);
+ zap_dir = (flags & DEL_FORCE_RECURSE || (force_delete && recurse))
+ && !(flags & DEL_NO_RECURSE);
if (dry_run && zap_dir)
errno = ENOTEMPTY;
else if (do_rmdir(fname) == 0) {