summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python
diff options
context:
space:
mode:
authorAlejandro Enedino Hernandez Samaniego <alejandro.enedino.hernandez-samaniego@xilinx.com>2018-12-07 17:33:46 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-09 11:08:11 +0000
commit55553c2477c353994d458a9680737f9af2590571 (patch)
tree594e0b9cb3164acf3243e7f2a6ed2f98830bf9cb /meta/recipes-devtools/python
parentd6bc389e816441d1af4cde09252b4f27fb074834 (diff)
downloadpoky-55553c2477c353994d458a9680737f9af2590571.tar.gz
create_manifest3: Dont match filenames which contain the directory name for new manifest
When creating a new python3 manifest, there is a corner case on which the filepath for a certain dependency that was found, could contain the path of an existing folder, e.g. ${libdir}/python3/xmlrpclib.py module path contains ${libdir}/python3/xml, this causes an issue where the dependency doesnt get eventually added on FILES for that module. This patch checks if the dependency that was found is a directory, if it is, it checks if it matches one of the existing directories on the manifest, if it is not, then it checks if the dependency's path (without the filename) matches one of the directories. (From OE-Core rev: 59db12fdf294cfab5c1730337d092a75867658f7) Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
-rw-r--r--meta/recipes-devtools/python/python3/create_manifest3.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python3/create_manifest3.py b/meta/recipes-devtools/python/python3/create_manifest3.py
index f7d4587030..4da02a2991 100644
--- a/meta/recipes-devtools/python/python3/create_manifest3.py
+++ b/meta/recipes-devtools/python/python3/create_manifest3.py
@@ -310,7 +310,13 @@ for pypkg in old_manifest:
310 pymodule_dep = pymodule_dep.replace(pyversion,'${PYTHON_MAJMIN}') 310 pymodule_dep = pymodule_dep.replace(pyversion,'${PYTHON_MAJMIN}')
311 inFolders = False 311 inFolders = False
312 for folder in allfolders: 312 for folder in allfolders:
313 if folder in pymodule_dep: 313 # The module could have a directory named after it, e.g. xml, if we take out the filename from the path
314 # we'll end up with ${libdir}, and we want ${libdir}/xml
315 if isFolder(pymodule_dep):
316 check_path = pymodule_dep
317 else:
318 check_path = os.path.dirname(pymodule_dep)
319 if folder in check_path :
314 inFolders = True # Did we find a folder? 320 inFolders = True # Did we find a folder?
315 folderFound = False # Second flag to break inner for 321 folderFound = False # Second flag to break inner for
316 # Loop only through packages which contain folders 322 # Loop only through packages which contain folders