[oe-commits] [openembedded-core] 74/77: combo-layer: handle file_exclude matching dirs

[git at git.openembedded.org]

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

commit 3e7e144799d79a6c4abcc7e49a4f789bb311845d
Author: Olaf Mandel <o.mandel at menlosystems.com>
AuthorDate: Fri Oct 21 09:24:27 2016 +0000

    combo-layer: handle file_exclude matching dirs
    
    If file_exclude matches a directory, os.unlink() got called with this
    directory as an argument.
    
    Filter out paths that end in a directory separator.
    
    This still leaves the (then empty) directories, but this does not affect
    the git commit.
    
    Signed-off-by: Olaf Mandel <o.mandel at menlosystems.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/combo-layer | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/combo-layer b/scripts/combo-layer
index 089b65f..d04d88b 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -294,6 +294,8 @@ def action_init(conf, args):
                     # again. Uses the list of files created by tar (easier
                     # than walking the tree).
                     for file in files.split('\n'):
+                        if file.endswith(os.path.sep):
+                            continue
                         for pattern in exclude_patterns:
                             if fnmatch.fnmatch(file, pattern):
                                 os.unlink(os.path.join(*([extract_dir] + ['..'] * subdir_components + [file])))

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