Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skip directories when symlinking libraries for PyPy3 #2204

Closed
wants to merge 1 commit into from
Closed

Skip directories when symlinking libraries for PyPy3 #2204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/changelog/2182.bugfix.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixed path collision that could lead to a PermissionError or writing to system
directories when using PyPy3.8 - by :user:`mgorny`.
2 changes: 2 additions & 0 deletions src/virtualenv/create/via_global_ref/builtin/pypy/pypy3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ def sources(cls, interpreter):
host_lib = Path(interpreter.system_prefix) / "lib"
if host_lib.exists() and host_lib.is_dir():
for path in host_lib.iterdir():
if path.is_dir():
continue
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once upon a time we needed to copy any shared object files in base/lib but these days we use RPATH in the libpypy3-c.so to find the lib dir, and that main shared object is now symlinked.

So in short, iterating over base/lib and copying the files is no longer needed, so lines 45-48 can be deleted. That means this whole method can be deleted.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... as long as os.symlink is available where the "portable PyPy" downloads (the ones from https://www.pypy.org/download.html) are used. Linux and brew build PyPy against system libraries, so they do not need the shared objects in the base/lib directory .

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mattip for 3.6 we still need this, not? What about Windows?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, 3.6 also uses symlinks and RPATH. Windows never needed this.

@mgorny could you change line 30, 31 to use pypy instead of python ?

yield PathRefToDest(path, dest=cls.to_lib)


Expand Down