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. (From OE-Core rev: e84b9185cc8f8e9f9df0e050543bb3a2c59426c3) Signed-off-by: Olaf Mandel <o.mandel@menlosystems.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
b48ed35fd5
commit
9af59d07a3
|
@ -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])))
|
||||
|
|
Loading…
Reference in New Issue