python3-setuptools: fix path creation in setup scripts 3592/head
authorAlexandru Ardelean <ardeleanalex@gmail.com>
Mon, 28 Nov 2016 14:51:07 +0000 (16:51 +0200)
committerAlexandru Ardelean <ardeleanalex@gmail.com>
Mon, 28 Nov 2016 14:51:11 +0000 (16:51 +0200)
Same as for python-setuptools (in previous commit).

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
lang/python3-setuptools/patches/0002-fix-pyvenv-environment-get.patch

index c46a5f309f804da5815331c970563f4d1c4fd6db..d96ab089c7b460833b2a3b5b5df3c62055122423 100644 (file)
@@ -1,13 +1,13 @@
 diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
-index df1655b..24c34e5 100755
+index e8b90c7..8598c44 100755
 --- a/setuptools/command/easy_install.py
 +++ b/setuptools/command/easy_install.py
-@@ -1885,7 +1885,7 @@ class CommandSpec(list):
+@@ -1946,6 +1946,8 @@ class CommandSpec(list):
+         Construct a CommandSpec from a parameter to build_scripts, which may
+         be None.
+         """
++        if os.environ.get('__PYVENV_LAUNCHER__'):
++            return cls.from_environment()
+         if isinstance(param, cls):
              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)