Repository navigation
Conversation
_is_path_in() used os.path.relpath() without catching ValueError. On Windows that raises when path and base are on different drives, so --enable-virtualenv crashed when the venv lived on another drive than PATH entries (issue SCons#3614). Catch ValueError and return False. Unit test covers the Windows cases and mocks the ValueError path on all platforms. Assisted-by: Claude Signed-off-by: Zhaoqi Xu <lzy00419@outlook.com>
Contributor
|
Can you add a note in CHANGES/RELEASE with the issue this fixes? |
Assisted-by: Claude Signed-off-by: Zhaoqi Xu <lzy00419@outlook.com>
Contributor
Author
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
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.
Summary
SCons.Platform.virtualenv._is_path_in()calledos.path.relpath(path, base)without handlingValueError. On Windows that raises when path and base are on different drives, so--enable-virtualenvcrashed when the venv lived on another drive than PATH entries (e.g. venv onW:while system Python / PATH entries onC:).Catch
ValueErrorand treat the path as outside the virtualenv (False), matching the intended "is this under the venv prefix?" check.Fixes #3614.
Test plan
python runtest.py SCons/Platform/virtualenvTests.py— 9 passed (includes new cross-drive / ValueError coverage)