diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2017-02-02 19:17:51 (GMT) |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2017-02-02 19:17:51 (GMT) |
| commit | 7601d780a77ef06541198e434dd83193c6755ee4 (patch) | |
| tree | f948765f408e7a6a65562fa2057fe7bc4054e5cb /Lib/venv | |
| parent | e1af6964b48671e3ac47ee60688a1b74fa272845 (diff) | |
| parent | 993f535ae9276efc7be61fb06a67b629ff92e25d (diff) | |
| download | cpython-7601d780a77ef06541198e434dd83193c6755ee4.zip cpython-7601d780a77ef06541198e434dd83193c6755ee4.tar.gz cpython-7601d780a77ef06541198e434dd83193c6755ee4.tar.bz2 | |
Closes #24875: Merged fix from 3.6.
Diffstat (limited to 'Lib/venv')
| -rw-r--r-- | Lib/venv/__init__.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py index 0a094e3..308e046 100644 --- a/Lib/venv/__init__.py +++ b/Lib/venv/__init__.py @@ -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): |