[oe-commits] Patrick Ohly : combo-layer: fix file_exclude for empty commits

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next-1.9
Commit: 3e310b8cd603539a2de115b2b73e1db35403b426
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3e310b8cd603539a2de115b2b73e1db35403b426

Author: Patrick Ohly <patrick.ohly at intel.com>
Date:   Fri Mar 27 14:53:12 2015 +0100

combo-layer: fix file_exclude for empty commits

The code detecting empty patches after removing files with
file_exclude failed for commits which were already empty before (like
the initial commit in some repos): such patches are completely empty
files, without a From line.

Detect that case and just let the normal empty patch detection deal
with it.

Signed-off-by: Patrick Ohly <patrick.ohly at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/combo-layer | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/combo-layer b/scripts/combo-layer
index fa60579..5d61fb1 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -665,6 +665,10 @@ def action_update(conf, args):
                     # Empty, ignore it. Must also remove from revlist.
                     with open(patch, 'r') as f:
                         fromline = f.readline()
+                    if not fromline:
+                        # Patch must have been empty to start with. No need
+                        # to remove it.
+                        continue
                     m = re.match(r'''^From ([0-9a-fA-F]+) .*\n''', fromline)
                     rev = m.group(1)
                     logger.debug('skipping empty patch %s = %s' % (patch, rev))