[oe-commits] Chris Larson : patch.bbclass: fix the logic error that resulted in tcp-wrappers patch application failures

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: a56048dedf697b749877bc258a5f751c96a71561
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a56048dedf697b749877bc258a5f751c96a71561

Author: Chris Larson <chris_larson at mentor.com>
Date:   Wed May 26 12:27:56 2010 -0700

patch.bbclass: fix the logic error that resulted in tcp-wrappers patch application failures

Signed-off-by: Chris Larson <chris_larson at mentor.com>

---

 classes/patch.bbclass |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/classes/patch.bbclass b/classes/patch.bbclass
index 73395e3..7b0c444 100644
--- a/classes/patch.bbclass
+++ b/classes/patch.bbclass
@@ -46,11 +46,12 @@ python patch_do_patch() {
 			local = os.path.join(workdir, base)
 			ext = os.path.splitext(base)[1]
 
-		apply = parm.get("apply")
-		if apply is not None and apply != "yes" and not "patch" in parm:
-			if apply != "no":
-				bb.msg.warn(None, "Unsupported value '%s' for 'apply' url param in '%s', please use 'yes' or 'no'" % (apply, url))
-			continue
+		if "apply" in parm:
+			apply = parm["apply"]
+			if apply != "yes":
+				if apply != "no":
+					bb.msg.warn(None, "Unsupported value '%s' for 'apply' url param in '%s', please use 'yes' or 'no'" % (apply, url))
+				continue
 		elif "patch" in parm:
 			bb.msg.warn(None, "Deprecated usage of 'patch' url param in '%s', please use 'apply={yes,no}'" % url)
 		elif ext not in (".diff", ".patch"):