fix: another clobbering issue #1066
Merged
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
wolfv
force-pushed
the
fix-clobber-once-more
branch
from
b05058c to
7a3c390
Compare
baszalmstra
reviewed
Feb 13, 2025
wolfv
commented
Feb 13, 2025
| @@ -737,19 +760,20 @@ pub fn link_package_sync( | |||
| // files that are either in the clobber map or contain a placeholder, | |||
| // we defer to the regular linking that comes after this block | |||
| // and re-add them to the paths_by_directory map | |||
| for file in files { | |||
| if clobber_paths.contains_key(&file.1) || file.0.prefix_placeholder.is_some() { | |||
There was a problem hiding this comment.
The problem was that we were using the computed path here, which already contained the "clobber"-modifications. And thus, we never re-added the path here...
baszalmstra
approved these changes
Feb 14, 2025
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.
This should fix #1061