rpms
/
python3.11
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove sys.executable check from change-user-install-location patch 

Resolves: rhbz#1532287
This commit is contained in:
Michal Cyprian 2018-02-02 12:27:49 +01:00
parent 14deb52d02
commit 08ffd081b5
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
00251-change-user-install-location.patch
View File

@ -1,19 +1,20 @@
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
index 9d31d13..ed44a93 100644 index 0258d3d..4ebf50a 100644
--- a/Lib/distutils/command/install.py --- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py
@@ -424,8 +424,18 @@ class install(Command): @@ -418,8 +418,19 @@ class install(Command):
raise DistutilsOptionError( raise DistutilsOptionError(
"must not supply exec-prefix without prefix") "must not supply exec-prefix without prefix")
- self.prefix = os.path.normpath(sys.prefix) - self.prefix = os.path.normpath(sys.prefix)
- self.exec_prefix = os.path.normpath(sys.exec_prefix) - self.exec_prefix = os.path.normpath(sys.exec_prefix)
+ # self.prefix is set to sys.prefix + /local/ + # self.prefix is set to sys.prefix + /local/
+ # if the executable is /usr/bin/python* and RPM build + # if neither RPM build nor virtual environment is
+ # is not detected to make pip and distutils install into + # detected to make pip and distutils install packages
+ # the separate location. + # into the separate location.
+ if (sys.executable.startswith("/usr/bin/python") + if (not (hasattr(sys, 'real_prefix') or
+ and 'RPM_BUILD_ROOT' not in os.environ): + sys.prefix != sys.base_prefix) and
+ 'RPM_BUILD_ROOT' not in os.environ):
+ addition = "/local" + addition = "/local"
+ else: + else:
+ addition = "" + addition = ""
@ -24,22 +25,21 @@ index 9d31d13..ed44a93 100644
else: else:
if self.exec_prefix is None: if self.exec_prefix is None:
diff --git a/Lib/site.py b/Lib/site.py diff --git a/Lib/site.py b/Lib/site.py
index 4744eb0..b5fe571 100644 index 0fc9200..c95202e 100644
--- a/Lib/site.py --- a/Lib/site.py
+++ b/Lib/site.py +++ b/Lib/site.py
@@ -326,7 +326,15 @@ def getsitepackages(prefixes=None): @@ -322,7 +322,14 @@ def getsitepackages(prefixes=None):
return sitepackages return sitepackages
def addsitepackages(known_paths, prefixes=None): def addsitepackages(known_paths, prefixes=None):
- """Add site-packages to sys.path""" - """Add site-packages to sys.path"""
+ """Add site-packages to sys.path. + """Add site-packages to sys.path
+ +
+ '/usr/local' is included in PREFIXES if the executable is /usr/bin/python* + '/usr/local' is included in PREFIXES if RPM build is not detected
+ and RPM build is not detected to make sudo pip installed packages visible. + to make packages installed into this location visible.
+ +
+ """ + """
+ if (ENABLE_USER_SITE and sys.executable.startswith("/usr/bin/python") + if ENABLE_USER_SITE and 'RPM_BUILD_ROOT' not in os.environ:
+ and 'RPM_BUILD_ROOT' not in os.environ):
+ PREFIXES.insert(0, "/usr/local") + PREFIXES.insert(0, "/usr/local")
for sitedir in getsitepackages(prefixes): for sitedir in getsitepackages(prefixes):
if os.path.isdir(sitedir): if os.path.isdir(sitedir):

6
python3.spec
View File

@ -14,7 +14,7 @@ URL: https://www.python.org/
# WARNING When rebasing to a new Python version, # WARNING When rebasing to a new Python version,
# remember to update the python3-docs package as well # remember to update the python3-docs package as well
Version: %{pybasever}.4 Version: %{pybasever}.4
Release: 11%{?dist} Release: 12%{?dist}
License: Python License: Python
@ -1502,6 +1502,10 @@ CheckPython optimized
# ====================================================== # ======================================================
%changelog %changelog
* Fri Feb 02 2018 Michal Cyprian <mcyprian@redhat.com> - 3.6.4-12
- Remove sys.executable check from change-user-install-location patch
Resolves: rhbz#1532287
* Thu Feb 01 2018 Charalampos Stratakis <cstratak@redhat.com> - 3.6.4-11 * Thu Feb 01 2018 Charalampos Stratakis <cstratak@redhat.com> - 3.6.4-11
- Define TLS cipher suite on build time. - Define TLS cipher suite on build time.