summaryrefslogtreecommitdiff
path: root/debian/patches/ensurepip-disabled.diff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2019-12-01 20:18:01 +0300
committerIgor Pashev <pashev.igor@gmail.com>2019-12-01 20:18:01 +0300
commit77d81aa4a3747b7dfbb17e43b16e1a514550c60c (patch)
tree0679778b3a5b46cb96d7c57485c847b83cc78bbf /debian/patches/ensurepip-disabled.diff
parentc089c4500b0b78acf03ee5405ad250a84b0dfa66 (diff)
downloadpython3.8-debian.tar.gz
Import python3.8 (3.8.0-5)debian/3.8.0-5debian
Diffstat (limited to 'debian/patches/ensurepip-disabled.diff')
-rw-r--r--debian/patches/ensurepip-disabled.diff6
1 files changed, 5 insertions, 1 deletions
diff --git a/debian/patches/ensurepip-disabled.diff b/debian/patches/ensurepip-disabled.diff
index ff221d7..be97912 100644
--- a/debian/patches/ensurepip-disabled.diff
+++ b/debian/patches/ensurepip-disabled.diff
@@ -1,5 +1,7 @@
# 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
@@ -49,9 +51,11 @@
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
-@@ -266,7 +266,28 @@ class EnvBuilder:
+@@ -286,7 +286,28 @@ class EnvBuilder:
# intended for the global Python environment
cmd = [context.env_exe, '-Im', 'ensurepip', '--upgrade',
'--default-pip']