sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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.

(From OE-Core rev: 3e310b8cd603539a2de115b2b73e1db35403b426)

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Patrick Ohly 2015-03-27 14:53:12 +01:00 committed by Richard Purdie
parent 3775c6e714
commit 240dadea12
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/combo-layer
View File

@ -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))