From 7dce685fe41c1474ec0ef5f1bd69926c29d30464 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 9 Mar 2018 14:27:46 +0200 Subject: meta/lib/oe/patch.py: do not leave .orig files if a patch isn't perfectly matching Particularly, this was causing 'devtool modify' to erroneously add those .orig files into commits. This was getting in the way, if the goal was to amend/update those existing patches. (From OE-Core rev: f4f3406c3bd9599d7a19275475d52bda4c42f2ab) Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oe/patch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/lib/oe') diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 584bf6c05f..f02dee8d27 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -212,7 +212,7 @@ class PatchTree(PatchSet): self.patches.insert(i, patch) def _applypatch(self, patch, force = False, reverse = False, run = True): - shellcmd = ["cat", patch['file'], "|", "patch", "-p", patch['strippath']] + shellcmd = ["cat", patch['file'], "|", "patch", "--no-backup-if-mismatch", "-p", patch['strippath']] if reverse: shellcmd.append('-R') -- cgit v1.2.3-54-g00ecf