main: use a better windows short-path comparison method #13598
Merged
+49
−8
Conversation
This file contains hidden or 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
| is_match = same_file and ( | ||
| os.path.islink(node.path) | ||
| == os.path.islink(matchparts[0]) | ||
| # account for short-paths on Windows (#11895). But use a version |
Member
There was a problem hiding this comment.
Let's move the logic into a function in compat and add a unittests?
Member
Author
There was a problem hiding this comment.
Done! Since I don't run windows, going to rely on CI to see if it actually passes there.
Member
There was a problem hiding this comment.
Sorry about that, I run Windows but didn't have time to check this.
psf-chronographer
bot
added
the
bot:chronographer:provided
The previous check does not account for multiple levels of symlinks: given a -> b -> c, a would match b.
Member
Author
|
Merging, should be good. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
The previous check does not account for multiple levels of symlinks: given a -> b -> c, a would match b.
Note, I don't use Windows and can't actually verify it, I only saw it reading the code. But if it's wrong hopefully the existing
test_do_not_collect_symlink_siblingstest will catch it on Windows CI.