commit 7aef5904365f72c9b7a88bff5431626ea604f9fa parent d083cafcd64f08b77122953281bc5e36d84c50d7 Author: Steven Barth <steven@midlink.org> Date: Tue, 8 Sep 2015 08:13:49 +0200 Merge pull request #1739 from commodo/setuptools-fixes python-setuptools: enforce __PYVENV_LAUNCHER__ env var use Diffstat:
| A | lang/python-setuptools/patches/0002-fix-pyvenv-environment-get.patch | | | 13 | +++++++++++++ |
1 file changed, 13 insertions(+), 0 deletions(-)
diff --git 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)