summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-03-09 14:27:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-11 06:26:59 -0700
commit7dce685fe41c1474ec0ef5f1bd69926c29d30464 (patch)
treeb61020d0658b4b9376e38b487f77b4be5fa74b39
parenta3e8538a3829974d7708ce49675caa1fae0e434b (diff)
downloadpoky-7dce685fe41c1474ec0ef5f1bd69926c29d30464.tar.gz
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 <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/patch.py2
1 files changed, 1 insertions, 1 deletions
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):
212 self.patches.insert(i, patch) 212 self.patches.insert(i, patch)
213 213
214 def _applypatch(self, patch, force = False, reverse = False, run = True): 214 def _applypatch(self, patch, force = False, reverse = False, run = True):
215 shellcmd = ["cat", patch['file'], "|", "patch", "-p", patch['strippath']] 215 shellcmd = ["cat", patch['file'], "|", "patch", "--no-backup-if-mismatch", "-p", patch['strippath']]
216 if reverse: 216 if reverse:
217 shellcmd.append('-R') 217 shellcmd.append('-R')
218 218