From e84b9185cc8f8e9f9df0e050543bb3a2c59426c3 Mon Sep 17 00:00:00 2001 From: Olaf Mandel Date: Fri, 21 Oct 2016 09:24:27 +0000 Subject: 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 Signed-off-by: Richard Purdie --- scripts/combo-layer | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/combo-layer b/scripts/combo-layer index 089b65f97e..d04d88b070 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]))) -- cgit 1.2.3-korg