diff options
| -rw-r--r-- | meta/lib/oe/patch.py | 6 |
1 files changed, 5 insertions, 1 deletions
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): | |||
| 219 | return _applypatchhelper(shellcmd, patch, force, reverse, run) | 219 | return _applypatchhelper(shellcmd, patch, force, reverse, run) |
| 220 | except CmdError: | 220 | except CmdError: |
| 221 | shellcmd = ["git", "--git-dir=.", "apply", "-p%s" % patch['strippath']] | 221 | shellcmd = ["git", "--git-dir=.", "apply", "-p%s" % patch['strippath']] |
| 222 | return _applypatchhelper(shellcmd, patch, force, reverse, run) | 222 | try: |
| 223 | output = _applypatchhelper(shellcmd, patch, force, reverse, run) | ||
| 224 | except CmdError: | ||
| 225 | output = PatchTree._applypatch(self, patch, force, reverse, run) | ||
| 226 | return output | ||
| 223 | 227 | ||
| 224 | 228 | ||
| 225 | class QuiltTree(PatchSet): | 229 | class QuiltTree(PatchSet): |
