Fix mixing relative friend paths and absolute classpaths with symlinks #5483
+44
−9
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
The fix for KT-60886 (a5b530d) converted calls to toAbsolutePath() to toRealPath() to fix the testDirectoryWithRelativePath test, which was failing due to comparing a normalized path to an unnormalized path (with ../../.. in it). Calling toRealPath() instead of toAbsolutePath() to get a normalized path also resolves any symlinks in the path to their targets. Since toRealPath() is not called on the absolute path it is being compared to it results in different absolute paths and the match check always fails. Use toAbsolutePath().normalize() to produce a normalize absolute path instead. Fixes https://youtrack.jetbrains.com/issue/KT-80039
colincross
requested review from
lunakoly,
mcpiroman,
aShalygin,
anton-bannykh,
agamzikova and
broadwaylamb
|
Thank you! Merged: |
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.
The fix for KT-60886 (a5b530d) converted calls to toAbsolutePath() to toRealPath() to fix the testDirectoryWithRelativePath test, which was failing due to comparing a normalized path to an unnormalized path (with ../../.. in it).
Calling toRealPath() instead of toAbsolutePath() to get a normalized path also resolves any symlinks in the path to their targets. Since toRealPath() is not called on the absolute path it is being compared to it results in different absolute paths and the match check always fails.
Use toAbsolutePath().normalize() to produce a normalize absolute path instead.
Fixes https://youtrack.jetbrains.com/issue/KT-80039