[oe-commits] Chris Larson : Revert "patch.bbclass: use param_bool()"

[git version control]

Module: openembedded.git
Branch: shr/testing2010
Commit: 8c04a982e9568762afa7d868670756332cd837ce
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8c04a982e9568762afa7d868670756332cd837ce

Author: Chris Larson <chris_larson at mentor.com>
Date:   Thu May 27 13:07:52 2010 -0700

Revert "patch.bbclass: use param_bool()"

This reverts commit 7cb990de933f22331cd701ecb45d1e30dd8f3c11.

---

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

diff --git a/classes/patch.bbclass b/classes/patch.bbclass
index 09ce781..7b0c444 100644
--- a/classes/patch.bbclass
+++ b/classes/patch.bbclass
@@ -6,7 +6,6 @@ QUILTRCFILE ?= "${STAGING_BINDIR_NATIVE}/quiltrc"
 PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot"
 
 python patch_do_patch() {
-	import oe.utils
 	import oe.patch
 
 	src_uri = (bb.data.getVar('SRC_URI', d, 1) or '').split()
@@ -47,13 +46,15 @@ python patch_do_patch() {
 			local = os.path.join(workdir, base)
 			ext = os.path.splitext(base)[1]
 
-		is_patch = ext in (".diff", ".patch")
-
-		if not oe.utils.param_bool(parm, 'apply', is_patch):
-			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 not is_patch:
+		elif ext not in (".diff", ".patch"):
 			continue
 
 		if not local: