Merge pull request #1739 from commodo/setuptools-fixes

python-setuptools: enforce __PYVENV_LAUNCHER__ env var use
2015-09-08 08:13:49 +02:00 · 2015-09-08 08:13:49 +02:00 · 7aef590436
commit 7aef590436
parent d083cafcd6 b9a0a65035
1 changed files with 13 additions and 0 deletions
--- a/lang/python-setuptools/patches/0002-fix-pyvenv-environment-get.patch
+++ b/lang/python-setuptools/patches/0002-fix-pyvenv-environment-get.patch
@ -0,0 +1,13 @@
+diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
+index df1655b..24c34e5 100755
+--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
+@@ -1885,7 +1885,7 @@ class CommandSpec(list):
+             return param
+         if isinstance(param, list):
+             return cls(param)
+-        if param is None:
+        if param is None or os.environ.get('__PYVENV_LAUNCHER__'):
+             return cls.from_environment()
+         # otherwise, assume it's a string.
+         return cls.from_string(param)