diff options
| author |   Cliff Brake <cbrake@bec-systems.com> | 2010-11-12 00:00:20 -0500 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2010-11-12 00:00:20 -0500 |
| commit | 3c6efe8f8abc16668ca5e9cdf7a46665dac87172 (patch) | |
| tree | 642c13416b99e80f0871cdc6668e832e635dfb48 /lib/oe/patch.py | |
| parent | c400c874f2ac9233b8a43a73309b6e7907289c54 (diff) | |
| parent | 13fbe7253c95881ede787004a4c3a1c31502e5c6 (diff) | |
| download | openembedded-testing.tar.gz | |
Merge branch 'master' into testing-nexttested_2010-11-12testing
Diffstat (limited to 'lib/oe/patch.py')
| -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) |