[OE-core] [PATCH v2] combo-layer: handle file_exclude matching dirs
Olaf Mandel
o.mandel at menlosystems.com
Fri Oct 21 09:24:27 UTC 2016
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>
---
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])))
--
2.1.4
More information about the Openembedded-core
mailing list