python-pip/remove-existing-dist-only-if-path-conflicts.patch

147 lines
6.0 KiB
Diff
Raw Normal View History

2021-10-13 11:34:37 +00:00
From 517656ed4520b09ac6365467e459778f94ca2f0c Mon Sep 17 00:00:00 2001
From: Karolina Surma <ksurma@redhat.com>
Date: Mon, 10 May 2021 18:16:20 +0200
2021-02-17 09:26:08 +00:00
Subject: [PATCH] Prevent removing of the system packages installed under
/usr/lib
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
when pip install --upgrade is executed.
Resolves: rhbz#1550368
Co-Authored-By: Michal Cyprian <m.cyprian@gmail.com>
Co-Authored-By: Victor Stinner <vstinner@redhat.com>
Co-Authored-By: Petr Viktorin <pviktori@redhat.com>
Co-Authored-By: Lumir Balhar <lbalhar@redhat.com>
Co-Authored-By: Miro Hrončok <miro@hroncok.cz>
---
2021-01-26 09:11:15 +00:00
src/pip/_internal/req/req_install.py | 3 ++-
src/pip/_internal/resolution/legacy/resolver.py | 5 ++++-
src/pip/_internal/resolution/resolvelib/factory.py | 13 +++++++++++++
2021-01-26 09:11:15 +00:00
src/pip/_internal/utils/misc.py | 11 +++++++++++
4 files changed, 30 insertions(+), 2 deletions(-)
2021-01-26 09:11:15 +00:00
diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
2021-10-13 11:34:37 +00:00
index ff0dd2f..a72aec8 100644
--- a/src/pip/_internal/req/req_install.py
+++ b/src/pip/_internal/req/req_install.py
2021-10-13 11:34:37 +00:00
@@ -46,6 +46,7 @@ from pip._internal.utils.misc import (
ask_path_exists,
backup_dir,
display_path,
+ dist_in_install_path,
dist_in_site_packages,
dist_in_usersite,
2020-08-05 16:46:46 +00:00
get_distribution,
2021-10-13 11:34:37 +00:00
@@ -433,7 +434,7 @@ class InstallRequirement:
existing_dist.project_name, existing_dist.location
)
)
- else:
+ elif dist_in_install_path(existing_dist):
self.should_reinstall = True
else:
2020-08-05 16:46:46 +00:00
if self.editable:
diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py
2021-10-13 11:34:37 +00:00
index 09caaa6..c1542ec 100644
--- a/src/pip/_internal/resolution/legacy/resolver.py
+++ b/src/pip/_internal/resolution/legacy/resolver.py
2021-10-13 11:34:37 +00:00
@@ -44,6 +44,7 @@ from pip._internal.resolution.base import BaseResolver, InstallRequirementProvid
from pip._internal.utils.compatibility_tags import get_supported
from pip._internal.utils.logging import indent_log
from pip._internal.utils.misc import dist_in_usersite, normalize_version_info
+from pip._internal.utils.misc import dist_in_install_path
2021-10-13 11:34:37 +00:00
from pip._internal.utils.packaging import check_requires_python
logger = logging.getLogger(__name__)
2021-10-13 11:34:37 +00:00
@@ -203,7 +204,9 @@ class Resolver(BaseResolver):
"""
# Don't uninstall the conflict if doing a user install and the
# conflict is not a user install.
- if not self.use_user_site or dist_in_usersite(req.satisfied_by):
+ if ((not self.use_user_site
+ or dist_in_usersite(req.satisfied_by))
+ and dist_in_install_path(req.satisfied_by)):
req.should_reinstall = True
req.satisfied_by = None
2021-01-26 09:11:15 +00:00
diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py
2021-10-13 11:34:37 +00:00
index 766dc26..c8c1cd8 100644
--- a/src/pip/_internal/resolution/resolvelib/factory.py
+++ b/src/pip/_internal/resolution/resolvelib/factory.py
@@ -1,6 +1,7 @@
import contextlib
2021-02-17 09:26:08 +00:00
import functools
import logging
+import sysconfig
from typing import (
TYPE_CHECKING,
Dict,
2021-10-13 11:34:37 +00:00
@@ -33,6 +34,7 @@ from pip._internal.exceptions import (
UnsupportedWheel,
)
from pip._internal.index.package_finder import PackageFinder
+from pip._internal.locations import get_scheme
from pip._internal.metadata import BaseDistribution, get_default_environment
from pip._internal.models.link import Link
from pip._internal.models.wheel import Wheel
2021-10-13 11:34:37 +00:00
@@ -45,6 +47,7 @@ from pip._internal.req.req_install import (
from pip._internal.resolution.base import InstallRequirementProvider
from pip._internal.utils.compatibility_tags import get_supported
from pip._internal.utils.hashes import Hashes
+from pip._internal.utils.misc import dist_location
2021-10-13 11:34:37 +00:00
from pip._internal.utils.packaging import get_requirement
from pip._internal.utils.virtualenv import running_under_virtualenv
2021-10-13 11:34:37 +00:00
@@ -526,6 +529,16 @@ class Factory:
2021-01-26 09:11:15 +00:00
if dist is None: # Not installed, no uninstallation required.
return None
+ # Prevent uninstalling packages from /usr
+ try:
+ if dist_location(dist._dist) in (
+ sysconfig.get_path('purelib', scheme='rpm_prefix'),
+ sysconfig.get_path('platlib', scheme='rpm_prefix'),
+ ):
+ return None
+ except KeyError: # this Python doesn't have 'rpm_prefix' scheme yet
+ pass
+
# We're installing into global site. The current installation must
# be uninstalled, no matter it's in global or user site, because the
2021-01-26 09:11:15 +00:00
# user site installation has precedence over global.
diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
2021-10-13 11:34:37 +00:00
index d3e9053..d25d1c3 100644
2021-01-26 09:11:15 +00:00
--- a/src/pip/_internal/utils/misc.py
+++ b/src/pip/_internal/utils/misc.py
2021-10-13 11:34:37 +00:00
@@ -38,6 +38,7 @@ from pip._vendor.tenacity import retry, stop_after_delay, wait_fixed
2021-01-26 09:11:15 +00:00
from pip import __version__
from pip._internal.exceptions import CommandError
from pip._internal.locations import get_major_minor_version, site_packages, user_site
+from pip._internal.locations import get_scheme
2021-10-13 11:34:37 +00:00
from pip._internal.utils.compat import WINDOWS
from pip._internal.utils.egg_link import egg_link_path_from_location
from pip._internal.utils.virtualenv import running_under_virtualenv
@@ -354,6 +355,16 @@ def dist_in_site_packages(dist: Distribution) -> bool:
2021-01-26 09:11:15 +00:00
return dist_location(dist).startswith(normalize_path(site_packages))
2021-01-26 09:11:15 +00:00
+def dist_in_install_path(dist):
+ """
+ Return True if given Distribution is installed in
+ path matching distutils_scheme layout.
+ """
+ norm_path = normalize_path(dist_location(dist))
+ return norm_path.startswith(normalize_path(
+ get_scheme("").purelib.split('python')[0]))
2021-01-26 09:11:15 +00:00
+
+
2021-10-13 11:34:37 +00:00
def get_distribution(req_name: str) -> Optional[Distribution]:
"""Given a requirement name, return the installed Distribution object.
--
2.32.0