mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fixes #24875: Merged fix from 3.5.

Browse source
This commit is contained in:
Vinay Sajip 2017-02-02 19:17:02 +00:00
commit 993f535ae9
2 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/venv/__init__.py
View file

@ -57,6 +57,10 @@ class EnvBuilder:
"""
env_dir = os.path.abspath(env_dir)
context = self.ensure_directories(env_dir)
# See issue 24875. We need system_site_packages to be False
# until after pip is installed.
true_system_site_packages = self.system_site_packages
self.system_site_packages = False
self.create_configuration(context)
self.setup_python(context)
if self.with_pip:
@ -64,6 +68,11 @@ class EnvBuilder:
if not self.upgrade:
self.setup_scripts(context)
self.post_setup(context)
if true_system_site_packages:
# We had set it to False before, now
# restore it and rewrite the configuration
self.system_site_packages = True
self.create_configuration(context)
def clear_directory(self, path):
for fn in os.listdir(path):