summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python3
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2015-04-16 09:45:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-07 13:40:33 +0100
commit0be72c2fb5621d365ff49bbf7e017ce796bd27a0 (patch)
treebd1ef83fa19cb068255e47809632ef4886e8d55e /meta/recipes-devtools/python/python3
parent528a25654503b3067e03d05a568c879c130c1e0c (diff)
downloadpoky-0be72c2fb5621d365ff49bbf7e017ce796bd27a0.tar.gz
python3-native: Fix pip install issue due to unclean build directory
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>
Diffstat (limited to 'meta/recipes-devtools/python/python3')
-rw-r--r--meta/recipes-devtools/python/python3/pip_build_directory_unclean.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python3/pip_build_directory_unclean.patch b/meta/recipes-devtools/python/python3/pip_build_directory_unclean.patch
new file mode 100644
index 0000000000..c0c4617d59
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/pip_build_directory_unclean.patch
@@ -0,0 +1,28 @@
1Index: Python-3.4.2/Lib/ensurepip/__init__.py
2===================================================================
3--- Python-3.4.2.orig/Lib/ensurepip/__init__.py
4+++ Python-3.4.2/Lib/ensurepip/__init__.py
5@@ -3,6 +3,7 @@ import os.path
6 import pkgutil
7 import sys
8 import tempfile
9+import pwd
10
11
12 __all__ = ["version", "bootstrap"]
13@@ -36,6 +37,15 @@ def _run_pip(args, additional_paths=None
14 if additional_paths is not None:
15 sys.path = additional_paths + sys.path
16
17+ # Explicitly make sure pip build directory was left clean
18+ user = pwd.getpwuid(os.getuid())[0]
19+ if os.path.exists("/tmp/pip_build_" + user + "/pip-delete-this-directory.txt"):
20+ os.remove("/tmp/pip_build_" + user + "/pip-delete-this-directory.txt")
21+ try:
22+ os.rmdir("/tmp/pip_build_" + user + "/")
23+ except OSError:
24+ print("Error: Pip build directory (%s) was left unclean, make sure it is clean before continuing\n" % ("/tmp/pip_build_" + user + "/"))
25+
26 # Install the bundled software
27 import pip
28 pip.main(args)