[oe-commits] [openembedded-core] 01/02: create_manifest3: Dont match filenames which contain the directory name for new manifest

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 59db12fdf294cfab5c1730337d092a75867658f7
Author: Alejandro Enedino Hernandez Samaniego <alejandro.enedino.hernandez-samaniego at xilinx.com>
AuthorDate: Fri Dec 7 17:33:46 2018 -0800

    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.
    
    Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr at xilinx.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-devtools/python/python3/create_manifest3.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/python/python3/create_manifest3.py b/meta/recipes-devtools/python/python3/create_manifest3.py
index f7d4587..4da02a2 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:
             pymodule_dep = pymodule_dep.replace(pyversion,'${PYTHON_MAJMIN}')
             inFolders = False
             for folder in allfolders:
-                if folder in pymodule_dep:
+                # The module could have a directory named after it, e.g. xml, if we take out the filename from the path
+                # we'll end up with ${libdir}, and we want ${libdir}/xml
+                if isFolder(pymodule_dep):
+                    check_path = pymodule_dep
+                else:
+                    check_path = os.path.dirname(pymodule_dep)
+                if folder in check_path :
                     inFolders = True # Did we find a folder?
                     folderFound = False # Second flag to break inner for
                     # Loop only through packages which contain folders

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.