diff options
| author |   Chris Larson <chris_larson@mentor.com> | 2010-10-22 11:04:36 -0700 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2010-11-08 07:59:23 -0700 |
| commit | 9018df571adb705688c8ec975d1407af70e82cde (patch) | |
| tree | d03865d64fed404d9535383256aa1c7422db1a4a /lib | |
| parent | 4e8c767f3fc281e26472e66ccde07419a2c092fc (diff) | |
| download | openembedded-9018df571adb705688c8ec975d1407af70e82cde.tar.gz | |
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 <chris_larson@mentor.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/oe/patch.py | 5 |
1 files changed, 1 insertions, 4 deletions
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) |