Skip to content
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

fix: ignore symlinks in fsync-store-paths (backport #12103) #12178

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

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 10, 2025

Motivation

When fsync-store-paths is enabled, during nix copy symlink store entries are treated as directory, which is not correct.

Context

Fixes #12099


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 #12103 done by [Mergify](https://mergify.com).

Fixes: #12099
(cherry picked from commit 4a91e62)

# Conflicts:
#	src/libutil/file-system.cc
Copy link
Contributor Author

mergify bot commented Jan 10, 2025

Cherry-pick of 4a91e62 has failed:

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

You are currently cherry-picking commit 4a91e627a.
  (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

@roberth roberth added the automatic backport This PR is a backport produced by automation (does not trigger backporting) label Jan 20, 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.

2 participants