diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2020-07-29 09:54:25 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2020-07-29 10:02:57 +0200 |
| commit | 3db16f64fdfa6fde20bc062e43b7c0b3388c0afa (patch) | |
| tree | 5d5ed246059f712005306a4aa089ef866d43a31f | |
| parent | dev-python/sphinxcontrib-spelling: Bump to 5.2.0 (diff) | |
| download | gentoo-3db16f64fdfa6fde20bc062e43b7c0b3388c0afa.tar.gz gentoo-3db16f64fdfa6fde20bc062e43b7c0b3388c0afa.tar.bz2 gentoo-3db16f64fdfa6fde20bc062e43b7c0b3388c0afa.zip | |
dev-python/pip: Unblock --prefix installs
Closes: https://bugs.gentoo.org/692960
Signed-off-by: Michał Górny <mgorny@gentoo.org>
| -rw-r--r-- | dev-python/pip/files/pip-20.0.2-disable-system-install.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/dev-python/pip/files/pip-20.0.2-disable-system-install.patch b/dev-python/pip/files/pip-20.0.2-disable-system-install.patch index c6b5354bc68f..e0b0034e407a 100644 --- a/dev-python/pip/files/pip-20.0.2-disable-system-install.patch +++ b/dev-python/pip/files/pip-20.0.2-disable-system-install.patch @@ -1,29 +1,29 @@ -From 57d610bbcc721c2e58fd2e9f3197bb3e3acbd935 Mon Sep 17 00:00:00 2001 +From 3aee04cbb93c0e479b040e682b2aef676629c9a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> Date: Sat, 1 Feb 2020 09:14:46 +0100 Subject: [PATCH] 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. +Running pip without --target, --prefix, --root, or --user will result +in packages being installed systemwide. This has a tendency to break +python-exec if setuptools gets installed or upgraded. --- src/pip/_internal/commands/install.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py -index 02a187c8..025b824b 100644 +index 8c2c32fd..41bac878 100644 --- a/src/pip/_internal/commands/install.py +++ b/src/pip/_internal/commands/install.py -@@ -246,6 +246,9 @@ class InstallCommand(RequirementCommand): +@@ -238,6 +238,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 and not os.getenv('GENTOO_PIP_TESTING'): ++ if not options.use_user_site and not options.target_dir and not options.root_path and not options.prefix_path and not os.getenv('GENTOO_PIP_TESTING'): + raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec") + cmdoptions.check_dist_restriction(options, check_target=True) install_options = options.install_options or [] -- -2.25.0 +2.28.0 |