From 3e310b8cd603539a2de115b2b73e1db35403b426 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Fri, 27 Mar 2015 14:53:12 +0100 Subject: 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 Signed-off-by: Richard Purdie --- scripts/combo-layer | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scripts') diff --git a/scripts/combo-layer b/scripts/combo-layer index fa60579272..5d61fb1c16 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)) -- cgit v1.2.3