mirror of
git://git.yoctoproject.org/poky
synced 2026-04-24 02:06:19 +00:00
0be72c2fb5
When installing python3-native sometimes pips default build directory (which is on the host and is user dependant) is left unclean, due to this, when python3-core is being installed it tries to use the same directory producing an error, this explicitly removes what the previous installation might have left behind, fixing the issue. (From OE-Core rev: c27a5a9ba649e7fcf681f6ac4575442e252fd29b) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
29 lines
1.0 KiB
Diff
29 lines
1.0 KiB
Diff
Index: Python-3.4.2/Lib/ensurepip/__init__.py
|
|
===================================================================
|
|
--- Python-3.4.2.orig/Lib/ensurepip/__init__.py
|
|
+++ Python-3.4.2/Lib/ensurepip/__init__.py
|
|
@@ -3,6 +3,7 @@ import os.path
|
|
import pkgutil
|
|
import sys
|
|
import tempfile
|
|
+import pwd
|
|
|
|
|
|
__all__ = ["version", "bootstrap"]
|
|
@@ -36,6 +37,15 @@ def _run_pip(args, additional_paths=None
|
|
if additional_paths is not None:
|
|
sys.path = additional_paths + sys.path
|
|
|
|
+ # Explicitly make sure pip build directory was left clean
|
|
+ user = pwd.getpwuid(os.getuid())[0]
|
|
+ if os.path.exists("/tmp/pip_build_" + user + "/pip-delete-this-directory.txt"):
|
|
+ os.remove("/tmp/pip_build_" + user + "/pip-delete-this-directory.txt")
|
|
+ try:
|
|
+ os.rmdir("/tmp/pip_build_" + user + "/")
|
|
+ except OSError:
|
|
+ print("Error: Pip build directory (%s) was left unclean, make sure it is clean before continuing\n" % ("/tmp/pip_build_" + user + "/"))
|
|
+
|
|
# Install the bundled software
|
|
import pip
|
|
pip.main(args)
|