diff options
| author |   Chris Larson <chris_larson@mentor.com> | 2010-10-21 18:46:27 -0700 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2010-10-21 20:10:06 -0700 |
| commit | 44887999faab4d885a7280d7e686a89a1720c4e6 (patch) | |
| tree | 1837ec0f9b493873768853b801fecf2d0bf63fcc /lib | |
| parent | c7a68fe6ff738b86d6da5e55ce4927f8fb06b38c (diff) | |
| download | openembedded-44887999faab4d885a7280d7e686a89a1720c4e6.tar.gz | |
oe.patch: don't use dry-run for 'patch'
There are patches which 'patch' thinks it can't apply, but which do apply, so
stop using dry-run. In addition, --dry-run isn't compatible with all versions
of patch.
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/oe/patch.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/oe/patch.py b/lib/oe/patch.py index ea5309f321..d153a0cd4a 100644 --- a/lib/oe/patch.py +++ b/lib/oe/patch.py @@ -80,11 +80,10 @@ class PatchTree(PatchSet): if not run: return subprocess.list2cmdline(shellcmd) - patch = open(patch['file'], "r") - if not force: - oe.process.run(shellcmd + ["--dry-run"], cwd=self.dir, stdin=patch) - patch.seek(0) + if force: + shellcmd.append('-f') + patch = open(patch['file'], "r") return oe.process.run(shellcmd, cwd=self.dir, env=self.env, stdin=patch) def Push(self, force = False, all = False, run = True): |