src/nix/prefetch: fix prefetch containing current directory instead o… #11051
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
new-cli
Mic92
commented
Jul 5, 2024
Mic92
force-pushed
the
fix-prefetch
branch
2 times, most recently
from
f901fe5 to
b52e752
Compare
|
I think, this bug is serious enough that it should be part of a patch release. Please backport to 2.23. |
…f tarball When --unpack was used the nix would add the current directory to the nix store instead of the content of unpacked. The reason for this is that std::distance already consumes the iterator. To fix this we re-instantiate the directory iterator in case the directory only contains a single entry.
roberth
added
the
backport 2.23-maintenance
edolstra
approved these changes
Jul 5, 2024
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
|
Successfully created backport PR for |
|
@Mic92 Thank you for fixing it, and especially thank you for adding a test as you did so. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…f tarball
When --unpack was used the nix would add the current directory to the nix store instead of the content of unpacked.
The reason for this is that std::distance already consumes the iterator. To fix this we re-instantiate the directory iterator in case the directory only contains a single entry.
Motivation
Context
Priorities and Process
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.