Also search the LICENSE file in lib64/pythonX.Y #1382
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
Several Linux distributions including Gentoo, Fedora, openSUSE put things in lib64/pythonX.Y instead of lib/pythonX.Y on 64bit architectures (x86_64, aarch64, etc.). This was already respected via the fix_lib64() function, however when virtualenv was searching for Python LICENSE, it was not. Now is the lib64/pythonX.Y patch searched as well and unlike fix_lib64() no checks need to be made, as the patch are tested in sequence. See pypa#1352 (comment)
asottile
reviewed
Jul 12, 2019
| @@ -1333,9 +1333,12 @@ def copy_required_files(src_dir, lib_dir, symlink): | |||
|
|
|||
| def copy_license(prefix, dst_prefix, lib_dir, symlink): | |||
| """Copy the license file so `license()` builtin works""" | |||
| lib64_dir = lib_dir.replace("lib", "lib64") | |||
There was a problem hiding this comment.
hmmm, shouldn't this split and then join so it is only removing a segment named lib -- this'll potentially fail for /foolib/lib/python3.6 or some such
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.
Several Linux distributions including Gentoo, Fedora, openSUSE
put things in lib64/pythonX.Y instead of lib/pythonX.Y on 64bit
architectures (x86_64, aarch64, etc.).
This was already respected via the fix_lib64() function, however
when virtualenv was searching for Python LICENSE, it was not.
Now is the lib64/pythonX.Y patch searched as well and unlike fix_lib64()
no checks need to be made, as the patch are tested in sequence.
See #1352 (comment)
Thanks for contributing a pull request, see checklist all is good!
test_license_builtin- not sure how would I mock lib64 Python on non-lib64 Python to test this on other platformsdocs/changelogfolder