From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Fri, 19 Dec 2014 11:41:45 +0000 (+0000)
Subject: lib/oe/patch: fall back to patch if git apply fails
X-Git-Tag: 2015-4~958
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a8143f33d3104adcd10968e3b05df2024e723f5a;p=openembedded-core.git

lib/oe/patch: fall back to patch if git apply fails

When PATCHTOOL = "git", git apply doesn't support fuzzy application, so
if a patch requires that it's better to be able to apply it rather than
just failing.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index b085c9d6b5..788f465bd9 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -219,7 +219,11 @@ class GitApplyTree(PatchTree):
             return _applypatchhelper(shellcmd, patch, force, reverse, run)
         except CmdError:
             shellcmd = ["git", "--git-dir=.", "apply", "-p%s" % patch['strippath']]
-            return _applypatchhelper(shellcmd, patch, force, reverse, run)
+            try:
+                output = _applypatchhelper(shellcmd, patch, force, reverse, run)
+            except CmdError:
+                output = PatchTree._applypatch(self, patch, force, reverse, run)
+            return output
 
 
 class QuiltTree(PatchSet):