diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-03-09 14:27:46 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-11 06:25:19 -0700 |
| commit | f4f3406c3bd9599d7a19275475d52bda4c42f2ab (patch) | |
| tree | fb40eb33d58c966cf57ea996307c5899b2bd1ac7 | |
| parent | 784f4418259fe441060c134a7dcf305f4e0d4e2d (diff) | |
| download | openembedded-core-f4f3406c3bd9599d7a19275475d52bda4c42f2ab.tar.gz openembedded-core-f4f3406c3bd9599d7a19275475d52bda4c42f2ab.tar.bz2 openembedded-core-f4f3406c3bd9599d7a19275475d52bda4c42f2ab.zip | |
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.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/lib/oe/patch.py | 2 |
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): 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') |