lede-packages-rs

commit 11078f389585679280b1b2b7a9eda825104cc22b
parent 6a188460894ca4dfeff6906a6f467e7531cd6f2b
Author: Hannu Nyman <hannu.nyman@iki.fi>
Date:   Mon, 28 Nov 2016 22:52:06 +0200

Merge pull request #3592 from commodo/python-setuptools-fix

python-setuptools,python3-setuptools: fix path creation in setup scripts
Diffstat:
M
lang/python-setuptools/patches/0002-fix-pyvenv-environment-get.patch
 | 
16
++++++++--------
M
lang/python3-setuptools/patches/0002-fix-pyvenv-environment-get.patch
 | 
16
++++++++--------

2 files changed, 16 insertions(+), 16 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
@@ -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)
diff --git a/lang/python3-setuptools/patches/0002-fix-pyvenv-environment-get.patch b/lang/python3-setuptools/patches/0002-fix-pyvenv-environment-get.patch
@@ -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)