Compare commits

...

1 Commits

Author SHA1 Message Date
Michal Cyprian ac2f266a90 Change default install location of pip and distutils
- Set distutils install command prefixes to /usr/local
  if the executable is /usr/bin/python* and RPM build
  is not detected
2017-04-21 16:08:18 +02:00
2 changed files with 66 additions and 1 deletions

View File

@ -0,0 +1,46 @@
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
index 9d31d13..ed44a93 100644
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
@@ -424,8 +424,18 @@ class install(Command):
raise DistutilsOptionError(
"must not supply exec-prefix without prefix")
- self.prefix = os.path.normpath(sys.prefix)
- self.exec_prefix = os.path.normpath(sys.exec_prefix)
+ # self.prefix is set to sys.prefix + /local/
+ # if the executable is /usr/bin/python* and RPM build
+ # is not detected to make pip and distutils install into
+ # the separate location.
+ if (sys.executable.startswith("/usr/bin/python")
+ and 'RPM_BUILD_ROOT' not in os.environ):
+ addition = "/local"
+ else:
+ addition = ""
+
+ self.prefix = os.path.normpath(sys.prefix) + addition
+ self.exec_prefix = os.path.normpath(sys.exec_prefix) + addition
else:
if self.exec_prefix is None:
diff --git a/Lib/site.py b/Lib/site.py
index 4744eb0..b5fe571 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -326,7 +326,15 @@ def getsitepackages(prefixes=None):
return sitepackages
def addsitepackages(known_paths, prefixes=None):
- """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*
+ and RPM build is not detected to make sudo pip installed packages visible.
+
+ """
+ if (ENABLE_USER_SITE and sys.executable.startswith("/usr/bin/python")
+ and 'RPM_BUILD_ROOT' not in os.environ):
+ PREFIXES.insert(0, "/usr/local")
for sitedir in getsitepackages(prefixes):
if os.path.isdir(sitedir):
addsitedir(sitedir, known_paths)

View File

@ -126,7 +126,7 @@
Summary: Version 3 of the Python programming language aka Python 3000
Name: python3
Version: %{pybasever}.1
Release: 0.1.%{?prerel}%{?dist}
Release: 0.5.%{?prerel}%{?dist}
License: Python
Group: Development/Languages
@ -414,6 +414,12 @@ Patch243: 00243-fix-mips64-triplet.patch
# Not yet fixed upstream: http://bugs.python.org/issue28787
Patch249: 00249-fix-out-of-tree-dtrace-builds.patch
# 00251
# Set values of prefix and exec_prefix in distutils install command
# to /usr/local if executable is /usr/bin/python* and RPM build
# is not detected to make pip and distutils install into separate location
Patch251: 00251-change-user-install-location.patch
# 00252
# Add executable option to install.py command to make it work for
# scripts specified as an entry_points
@ -697,6 +703,7 @@ sed -r -i s/'_PIP_VERSION = "[0-9.]+"'/'_PIP_VERSION = "%{pip_version}"'/ Lib/en
%patch206 -p1
%patch243 -p1
%patch249 -p1
%patch251 -p1
%patch252 -p1
%patch258 -p1
%patch260 -p1
@ -1651,6 +1658,18 @@ fi
# ======================================================
%changelog
* Mon Mar 20 2017 Michal Cyprian <mcyprian@redhat.com> - 3.6.1-0.5.rc1
- rebuilt
* Mon Mar 20 2017 Michal Cyprian <mcyprian@redhat.com> - 3.6.1-0.4.rc1
- rebuilt
* Mon Mar 20 2017 Michal Cyprian <mcyprian@redhat.com> - 3.6.1-0.3.rc1
- rebuilt
* Mon Mar 20 2017 Michal Cyprian <mcyprian@redhat.com> - 3.6.1-0.2.rc1
- rebuilt
* Thu Mar 16 2017 Iryna Shcherbina <ishcherb@redaht.com> - 3.6.1-0.1.rc1
- Update to Python 3.6.1 release candidate 1
- Add patch 264 to skip a known test failure on aarch64