From 9018df571adb705688c8ec975d1407af70e82cde Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 22 Oct 2010 11:04:36 -0700 Subject: oe.patch: for 'patch', always use -f Apparently quilt always ignores hunks that seem already applied, so let's do the same via -f. -t would probably be better, but isn't safe to use from a portability standpoint. Signed-off-by: Chris Larson --- lib/oe/patch.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/oe/patch.py b/lib/oe/patch.py index 29d5102775..4e709be6ad 100644 --- a/lib/oe/patch.py +++ b/lib/oe/patch.py @@ -73,16 +73,13 @@ class PatchTree(PatchSet): self.patches.insert(i, patch) def _applypatch(self, patch, force = False, reverse = False, run = True): - shellcmd = ["patch", "-p%s" % patch['strippath']] + shellcmd = ["patch", "-p%s" % patch['strippath'], "-f"] if reverse: shellcmd.append('-R') if not run: return subprocess.list2cmdline(shellcmd) - if force: - shellcmd.append('-f') - patch = open(patch['file'], "r") return oe.process.run(shellcmd, cwd=self.dir, env=self.env, stdin=patch) -- cgit 1.2.3-korg