[oe-commits] [openembedded-core] 05/43: meta/lib/oe/patch.py: do not leave .orig files if a patch isn't perfectly matching

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 3fe3f569defa773b4a63daa68ab1033816658e53
Author: Alexander Kanavin <alexander.kanavin at linux.intel.com>
AuthorDate: Fri Mar 9 14:27:46 2018 +0200

    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 at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/lib/oe/patch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 584bf6c..f02dee8 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')
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.