diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-30 08:49:38 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-30 08:49:38 +0100 |
| commit | b2be182d49eea46686b5cf2680d457df61e89dc4 (patch) | |
| tree | c66442ced2011c5ca81c3114cc51041e314c6d33 /dev-python/pip/files | |
| parent | e23cdda4dbb0c83b9e682ab5e916085a35203da5 (diff) | |
gentoo resync : 30.06.2018
Diffstat (limited to 'dev-python/pip/files')
| -rw-r--r-- | dev-python/pip/files/pip-10.0.1-disable-system-install.patch | 18 | ||||
| -rw-r--r-- | dev-python/pip/files/pip-10.0.1-disable-version-check.patch | 19 |
2 files changed, 37 insertions, 0 deletions
diff --git a/dev-python/pip/files/pip-10.0.1-disable-system-install.patch b/dev-python/pip/files/pip-10.0.1-disable-system-install.patch new file mode 100644 index 000000000000..776d395b7b94 --- /dev/null +++ b/dev-python/pip/files/pip-10.0.1-disable-system-install.patch @@ -0,0 +1,18 @@ +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-10.0.1/src/pip/_internal/commands/install.py ++++ pip-10.0.1/src/pip/_internal/commands/install.py +@@ -202,6 +202,9 @@ + 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-10.0.1-disable-version-check.patch b/dev-python/pip/files/pip-10.0.1-disable-version-check.patch new file mode 100644 index 000000000000..ad146dc1507f --- /dev/null +++ b/dev-python/pip/files/pip-10.0.1-disable-version-check.patch @@ -0,0 +1,19 @@ +Don't check for new versions of pip. + +--- pip-10.0.1/src/pip/_internal/basecommand.py ++++ pip-10.0.1/src/pip/_internal/basecommand.py +@@ -255,14 +255,6 @@ +
+ return UNKNOWN_ERROR
+ finally:
+- # Check if we're using the latest version of pip available
+- if (not options.disable_pip_version_check and not
+- getattr(options, "no_index", False)):
+- with self._build_session(
+- options,
+- retries=0,
+- timeout=min(5, options.timeout)) as session:
+- pip_version_check(session, options)
+ # Avoid leaking loggers
+ for handler in set(logging.root.handlers) - original_root_handlers:
+ # this method benefit from the Logger class internal lock
|