mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-16 04:09:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.

(From OE-Core rev: a8143f33d3104adcd10968e3b05df2024e723f5a)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton
2014-12-19 11:41:45 +00:00
committed by Richard Purdie
parent de8730ce2d
commit e03c04758b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/lib/oe/patch.py
View File

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