diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2019-12-01 17:44:24 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2019-12-01 17:44:24 +0300 |
| commit | c089c4500b0b78acf03ee5405ad250a84b0dfa66 (patch) | |
| tree | 23870848d194569aff6e0e4e41bc7907960b1af1 /debian/patches/ensurepip-disabled.diff | |
| parent | 377002e7300431b68f3548d9fd2c7f99cf883939 (diff) | |
| download | python3.7-debian.tar.gz | |
Import python3.7 (3.7.5-2)debian/3.7.5-2debian
Diffstat (limited to 'debian/patches/ensurepip-disabled.diff')
| -rw-r--r-- | debian/patches/ensurepip-disabled.diff | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/debian/patches/ensurepip-disabled.diff b/debian/patches/ensurepip-disabled.diff index f19b36a..ff221d7 100644 --- a/debian/patches/ensurepip-disabled.diff +++ b/debian/patches/ensurepip-disabled.diff @@ -1,7 +1,5 @@ # DP: Disable ensurepip for the system installation, only enable it for virtual environments. -Index: b/Lib/ensurepip/__init__.py -=================================================================== --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -8,6 +8,34 @@ import tempfile @@ -39,7 +37,7 @@ Index: b/Lib/ensurepip/__init__.py _PROJECTS = [ "setuptools", -@@ -56,6 +84,11 @@ def bootstrap(*, root=None, upgrade=Fals +@@ -75,6 +103,11 @@ def _bootstrap(*, root=None, upgrade=Fal Note that calling this function will alter both sys.path and os.environ. """ @@ -51,11 +49,9 @@ Index: b/Lib/ensurepip/__init__.py if altinstall and default_pip: raise ValueError("Cannot use altinstall and default_pip together") -Index: b/Lib/venv/__init__.py -=================================================================== --- a/Lib/venv/__init__.py +++ b/Lib/venv/__init__.py -@@ -242,7 +242,28 @@ class EnvBuilder: +@@ -266,7 +266,28 @@ class EnvBuilder: # intended for the global Python environment cmd = [context.env_exe, '-Im', 'ensurepip', '--upgrade', '--default-pip'] |