Skip to content

deletePath(): Keep going when encountering an undeletable file (backport #13300) #13608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 2.29-maintenance
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 30, 2025

Motivation

This should reduce the impact of #5207 (i.e. if we can't delete one directory for whatever reason, we should still try to delete everything else).

Context


Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.


This is an automatic backport of pull request #13300 done by [Mergify](https://mergify.com).

This should reduce the impact of #5207.

(cherry picked from commit 6b6d3dc)

# Conflicts:
#	src/libutil/file-system.cc
@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue labels Jul 30, 2025
@mergify mergify bot requested a review from edolstra as a code owner July 30, 2025 12:34
Copy link
Contributor Author

mergify bot commented Jul 30, 2025

Cherry-pick of 6b6d3dc has failed:

On branch mergify/bp/2.29-maintenance/pr-13300
Your branch is up to date with 'origin/2.29-maintenance'.

You are currently cherry-picking commit 6b6d3dcf3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/libutil/file-system.cc

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added merge-queue conflicts automatic backport This PR is a backport produced by automation (does not trigger backporting) labels Jul 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant