Only preserve the executable bit #1743
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
konstin
commented
Feb 20, 2024
crates/uv-extract/src/stream.rs
Outdated
| fs_err::set_permissions(&path, Permissions::from_mode(mode))?; | ||
| // Create a file with read and write permissions. | ||
| // Otherwise, databricks-0.2.dist-info/RECORD in databricks-0.2-py2.py3-none-any.whl has 000 permissions. | ||
| let permissions = Permissions::from_mode(mode | 0o660); |
There was a problem hiding this comment.
Permission seems to lack an api to set read and write without manual bitflags math.
There was a problem hiding this comment.
This should take umask into account, see https://github.com/pypa/pip/blob/main/src/pip/_internal/operations/install/wheel.py#L652
There was a problem hiding this comment.
Thanks for the pip reference!
I rewrote it so that we're now never setting the permissions explicitly ourselves, but instead first create the file with the default options and then attach the executable bit if required.
konstin
changed the title
charliermarsh
approved these changes
Feb 20, 2024
konstin
force-pushed
the
konsti/set-extract-permissions
branch
from
8820655
to
9bddac7
Compare
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.
A file in a zip can set arbitrary unix permissions, but we, like pip, want to preserve only the executable bit and otherwise use the OS defaults.
This should be faster for wheels with many files since we now avoid the blocking fs call to set the permissions in most cases.
Fixes #1740.