[oe-commits] Paul Eggleton : scripts/combo-layer: skip empty commits

[git at git.openembedded.org]

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

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Mon Nov  7 12:07:02 2011 +0000

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.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

---

 scripts/combo-layer |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/scripts/combo-layer b/scripts/combo-layer
index 597d6cb..b4b1e48 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):