cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
python-setuptools,python3-setuptools: fix path creation in setup scripts
This commit is contained in:
Hannu Nyman
2016-11-28 22:52:06 +02:00
committed by GitHub
parent 6a18846089 c3441865ca
commit 11078f3895
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/python-setuptools/patches/0002-fix-pyvenv-environment-get.patch
+8 -8
View File
@@ -1,13 +1,13 @@
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py 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 --- a/setuptools/command/easy_install.py
+++ b/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 return param
if isinstance(param, list): 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)
lang/python3-setuptools/patches/0002-fix-pyvenv-environment-get.patch
+8 -8
View File
@@ -1,13 +1,13 @@
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py 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 --- a/setuptools/command/easy_install.py
+++ b/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 return param
if isinstance(param, list): 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)