diff options
-rw-r--r-- | meta/lib/oe/patch.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 2bf30651eb..522778140c 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py | |||
@@ -290,6 +290,12 @@ class GitApplyTree(PatchTree): | |||
290 | shellcmd = ["git", "--work-tree=.", "am", "-3", "--keep-cr", "-p%s" % patch['strippath']] | 290 | shellcmd = ["git", "--work-tree=.", "am", "-3", "--keep-cr", "-p%s" % patch['strippath']] |
291 | return _applypatchhelper(shellcmd, patch, force, reverse, run) | 291 | return _applypatchhelper(shellcmd, patch, force, reverse, run) |
292 | except CmdError: | 292 | except CmdError: |
293 | # Need to abort the git am, or we'll still be within it at the end | ||
294 | try: | ||
295 | shellcmd = ["git", "--work-tree=.", "am", "--abort"] | ||
296 | runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) | ||
297 | except CmdError: | ||
298 | pass | ||
293 | # Fall back to git apply | 299 | # Fall back to git apply |
294 | shellcmd = ["git", "--git-dir=.", "apply", "-p%s" % patch['strippath']] | 300 | shellcmd = ["git", "--git-dir=.", "apply", "-p%s" % patch['strippath']] |
295 | try: | 301 | try: |