From ba5537d7687b1f735d8894f959c6c1a92c769a04 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 7 Nov 2011 12:07:02 +0000 Subject: scripts/combo-layer: skip empty commits If a commit is empty (for example, commits brought over from svn where only properties were changed) then attempting to apply it with "git am" will result in the error "Patch format detection failed", so skip it instead. (From OE-Core rev: 5754bc7bcc2f57b6b56e67e2900eeaab5bc184d8) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/combo-layer | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'scripts/combo-layer') diff --git a/scripts/combo-layer b/scripts/combo-layer index 597d6cb835..b4b1e4891e 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -252,18 +252,21 @@ def action_apply_patch(conf, args): for line in open(repo['patchlist']): patchfile = line.split()[0] lastrev = line.split()[1] - cmd = "git am --keep-cr -s -p1 %s" % patchfile - logger.info("Apply %s" % patchfile ) - try: - runcmd(cmd) - except subprocess.CalledProcessError: - logger.info('running "git am --abort" to cleanup repo') - runcmd("git am --abort") - logger.error('"%s" failed' % cmd) - logger.info("please manually apply patch %s" % patchfile) - logger.info("After applying, run this tool again to apply the remaining patches") - conf.update(name, "last_revision", lastrev) - sys.exit(0) + if os.path.getsize(patchfile) == 0: + logger.info("(skipping %s - no changes)", lastrev) + else: + cmd = "git am --keep-cr -s -p1 %s" % patchfile + logger.info("Apply %s" % patchfile ) + try: + runcmd(cmd) + except subprocess.CalledProcessError: + logger.info('running "git am --abort" to cleanup repo') + runcmd("git am --abort") + logger.error('"%s" failed' % cmd) + logger.info("please manually apply patch %s" % patchfile) + logger.info("After applying, run this tool again to apply the remaining patches") + conf.update(name, "last_revision", lastrev) + sys.exit(0) conf.update(name, "last_revision", lastrev) def action_splitpatch(conf, args): -- cgit v1.2.3-54-g00ecf