Commit 217cc3b0 authored by Wayne Davison's avatar Wayne Davison

- The call to delete_file() needs DEL_NO_RECURSE when handling

  delete_before or delete_after or --dry-run will report too
  many deletions.
- Changed DEL_RECURSE to DEL_FORCE_RECURSE.
parent 757e0a54
......@@ -1724,8 +1724,10 @@ void delete_in_dir(struct file_list *flist, char *fname)
safe_fname(f));
}
} else {
delete_file(f, S_ISDIR(mode)
? DEL_DIR | DEL_RECURSE : 0);
int dflags = delete_during
? DEL_DIR | DEL_FORCE_RECURSE
: DEL_DIR | DEL_NO_RECURSE;
delete_file(f, S_ISDIR(mode) ? dflags : 0);
}
deletion_count++;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment