Fixed a failing hunk.
authorWayne Davison <wayned@samba.org>
Tue, 22 Feb 2005 03:18:27 +0000 (03:18 +0000)
committerWayne Davison <wayned@samba.org>
Tue, 22 Feb 2005 03:18:27 +0000 (03:18 +0000)
backup-dir-dels.diff

index 390e386..179bc76 100644 (file)
@@ -140,7 +140,7 @@ Marc St-Onge
                errno = ENOTEMPTY;
 -      } else if (make_backups && !backup_dir && !is_backup_file(fname)
 +      } else if (make_backups && !backup_dir_rm && !is_backup_file(fname)
-           && !zap_dir)
+           && !(flags & DEL_FORCE_RECURSE))
 -              ok = make_backup(fname);
 +              ok = safe_delete(fname);
        else