Allow --force to work even if --recurse was not specified.
authorWayne Davison <wayned@samba.org>
Mon, 30 Jan 2006 18:35:54 +0000 (18:35 +0000)
committerWayne Davison <wayned@samba.org>
Mon, 30 Jan 2006 18:35:54 +0000 (18:35 +0000)
generator.c

index 74cfd6a..97395a7 100644 (file)
@@ -144,7 +144,7 @@ static int delete_item(char *fname, int mode, int flags)
                return -1;
        }
 
-       zap_dir = flags & DEL_FORCE_RECURSE || (force_delete && recurse);
+       zap_dir = flags & DEL_FORCE_RECURSE || force_delete;
        if ((max_delete && ++deletion_count > max_delete)
            || (dry_run && zap_dir)) {
                ok = 0;