diff options
Diffstat (limited to 'dev-python/pip/files')
| -rw-r--r-- | dev-python/pip/files/pip-19.1-disable-system-install.patch | 17 | ||||
| -rw-r--r-- | dev-python/pip/files/pip-19.1-disable-version-check.patch | 19 |
2 files changed, 0 insertions, 36 deletions
diff --git a/dev-python/pip/files/pip-19.1-disable-system-install.patch b/dev-python/pip/files/pip-19.1-disable-system-install.patch deleted file mode 100644 index bc88ef715a2e..000000000000 --- a/dev-python/pip/files/pip-19.1-disable-system-install.patch +++ /dev/null @@ -1,17 +0,0 @@ -install: Raise an error to avoid breaking python-exec - -Running pip without --target, --root, or --user will result in packages -being installed systemwide. This has a tendency to break python-exec if -setuptools gets installed or upgraded. - ---- pip-19.1/src/pip/_internal/commands/install.py -+++ pip-19.1/src/pip/_internal/commands/install.py -@@ -246,6 +246,9 @@ class InstallCommand(RequirementCommand): - if options.upgrade: - upgrade_strategy = options.upgrade_strategy - -+ if not options.use_user_site and not options.target_dir and not options.root_path: -+ raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec") -+ - if options.build_dir: - options.build_dir = os.path.abspath(options.build_dir) diff --git a/dev-python/pip/files/pip-19.1-disable-version-check.patch b/dev-python/pip/files/pip-19.1-disable-version-check.patch deleted file mode 100644 index a46a47f0fc68..000000000000 --- a/dev-python/pip/files/pip-19.1-disable-version-check.patch +++ /dev/null @@ -1,19 +0,0 @@ -Don't check for new versions of pip. - ---- pip-19.1/src/pip/_internal/cli/base_command.py -+++ pip-19.1/src/pip/_internal/cli/base_command.py -@@ -213,12 +213,8 @@ class Command(object): - - return UNKNOWN_ERROR - finally: -- allow_version_check = ( -- # Does this command have the index_group options? -- hasattr(options, "no_index") and -- # Is this command allowed to perform this check? -- not (options.disable_pip_version_check or options.no_index) -- ) -+ # Disabled on Gentoo -+ allow_version_check = False - # Check if we're using the latest version of pip available - if allow_version_check: - session = self._build_session( |