[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3147/8267] combo-layer: handle file_exclude matching dirs

[Emmanuele Bassi <ebassi src gnome org>]

commit 9af59d07a358fe23bff10ee957bf8fc63344e8e2
Author: Olaf Mandel <o mandel menlosystems com>
Date:   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.
    
    (From OE-Core rev: e84b9185cc8f8e9f9df0e050543bb3a2c59426c3)
    
    Signed-off-by: Olaf Mandel <o mandel menlosystems com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/combo-layer |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
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])))