If we don't do this, you may still be in the git am resolution mode at the end of applying patches, which is not desirable.
Signed-off-by: Paul Eggleton <[email protected]> --- meta/lib/oe/patch.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 2bf3065..5227781 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -290,6 +290,12 @@ class GitApplyTree(PatchTree): shellcmd = ["git", "--work-tree=.", "am", "-3", "--keep-cr", "-p%s" % patch['strippath']] return _applypatchhelper(shellcmd, patch, force, reverse, run) except CmdError: + # Need to abort the git am, or we'll still be within it at the end + try: + shellcmd = ["git", "--work-tree=.", "am", "--abort"] + runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) + except CmdError: + pass # Fall back to git apply shellcmd = ["git", "--git-dir=.", "apply", "-p%s" % patch['strippath']] try: -- 1.9.3 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
