From f83eacf40f1506418e74d747906b8f108401f91d Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 26 Jan 2021 09:05:07 +0100 Subject: [PATCH] Prevent removing of the system packages installed under /usr/lib when pip install -U is executed. Resolves: rhbz#1550368 Co-Authored-By: Michal Cyprian Co-Authored-By: Victor Stinner Co-Authored-By: Petr Viktorin --- src/pip/_internal/req/req_install.py | 3 ++- src/pip/_internal/resolution/legacy/resolver.py | 5 ++++- src/pip/_internal/resolution/resolvelib/factory.py | 10 ++++++++++ src/pip/_internal/utils/misc.py | 11 +++++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py index 6d0aa30..0a5f8ed 100644 --- a/src/pip/_internal/req/req_install.py +++ b/src/pip/_internal/req/req_install.py @@ -39,6 +39,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, get_distribution, @@ -445,7 +446,7 @@ class InstallRequirement: "lack sys.path precedence to {} in {}".format( existing_dist.project_name, existing_dist.location) ) - else: + elif dist_in_install_path(existing_dist): self.should_reinstall = True else: if self.editable: diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py index 665dba1..a219e63 100644 --- a/src/pip/_internal/resolution/legacy/resolver.py +++ b/src/pip/_internal/resolution/legacy/resolver.py @@ -34,6 +34,7 @@ from pip._internal.resolution.base import BaseResolver 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 from pip._internal.utils.packaging import check_requires_python, get_requires_python from pip._internal.utils.typing import MYPY_CHECK_RUNNING @@ -204,7 +205,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 diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index be0729e..bc2912b 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -1,5 +1,6 @@ import functools import logging +import sys from pip._vendor.packaging.utils import canonicalize_name @@ -19,7 +20,9 @@ from pip._internal.utils.misc import ( dist_in_site_packages, dist_in_usersite, get_installed_distributions, + dist_location, ) +from pip._internal.locations import distutils_scheme from pip._internal.utils.typing import MYPY_CHECK_RUNNING from pip._internal.utils.virtualenv import running_under_virtualenv @@ -362,6 +365,13 @@ class Factory: if dist is None: # Not installed, no uninstallation required. return None + # Prevent uninstalling packages from /usr + if dist_location(dist) in ( + distutils_scheme('', prefix=sys.base_prefix)['purelib'], + distutils_scheme('', prefix=sys.base_prefix)['platlib'], + ): + return None + # We're installing into global site. The current installation must # be uninstalled, no matter it's in global or user site, because the # user site installation has precedence over global. diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py index 6dd94e2..7925518 100644 --- a/src/pip/_internal/utils/misc.py +++ b/src/pip/_internal/utils/misc.py @@ -27,6 +27,7 @@ from pip._vendor.retrying import retry # type: ignore 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 distutils_scheme, get_major_minor_version, site_packages, user_site from pip._internal.utils.compat import WINDOWS, stdlib_pkgs from pip._internal.utils.typing import MYPY_CHECK_RUNNING, cast from pip._internal.utils.virtualenv import ( @@ -398,6 +399,16 @@ def dist_in_site_packages(dist): return dist_location(dist).startswith(normalize_path(site_packages)) +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( + distutils_scheme("")['purelib'].split('python')[0])) + + def dist_is_editable(dist): # type: (Distribution) -> bool """ -- 2.29.2