X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/82471e68a8bb3da8ca95f2b6564c330c52ce891e..4366d2c42853a88ce7cef62e2cb22d314607cf69:/rsync.c

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) {