hooks: fix pkgutil.iter_modules when paths involve symbolic links #6539
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
rokm
force-pushed
the
pkgutil-hook-symlinks
branch
from
51c9104
to
fe42264
Compare
In our pkgutil.iter_module replacement, we need to fully resolve both the sys._MEIPASS and the given search paths, in case either contains a symbolic link. Failing to do so leads to path mis-match when symbolic links are involved and the given search paths are already fully resolved. This may happen on macOS with onefile builds if the caller of pkgutil.iter_module fully resolves the search path(s) before calling the function (issue pyinstaller#6537). Add a test that reproduces scenario from pyinstaller#6537.
rokm
force-pushed
the
pkgutil-hook-symlinks
branch
from
fe42264
to
8422749
Compare
bwoodsend
approved these changes
Jan 25, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
In our
pkgutil.iter_modulereplacement, we need to fully resolve both thesys._MEIPASSand the given search paths, in case either contains a symbolic link. Failing to do so leads to path mis-match when symbolic links are involved and the given search paths are already fully resolved. This may happen on macOS with onefile builds if the caller ofpkgutil.iter_modulefully resolves the search path(s) before calling the function (issue #6537).Add a test that reproduces scenario from #6537.
Fixes #6537.