From: Chris Larson <chris_larson@mentor.com>
Date: Fri, 22 Oct 2010 01:46:27 +0000 (-0700)
Subject: oe.patch: don't use dry-run for 'patch'
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44887999faab4d885a7280d7e686a89a1720c4e6;p=openembedded.git

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>
---

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):