[oe-commits] Chris Larson : Revert "base.bbclass: fixed 'apply=no' behavior"

[git version control]

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

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

Revert "base.bbclass: fixed 'apply=no' behavior"

This reverts commit eb8ad2af3a59dc7b4c64814815fc13977efaec6b.

---

 classes/base.bbclass |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/classes/base.bbclass b/classes/base.bbclass
index a36fcbf..8bac509 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -163,7 +163,6 @@ python base_do_fetch() {
 
 def oe_unpack_file(file, data, url = None):
 	import subprocess
-	import oe.utils
 	if not url:
 		url = "file://%s" % file
 	dots = file.split(".")
@@ -208,9 +207,7 @@ def oe_unpack_file(file, data, url = None):
 		cmd = 'cp -pPR %s %s/%s/' % (file, os.getcwd(), destdir)
 	else:
 		(type, host, path, user, pswd, parm) = bb.decodeurl(url)
-		is_patch = path.endswith('.diff') or path.endswith('.patch')
-		if not oe.utils.param_bool(parm, 'apply', is_patch) and \
-		   not oe.utils.param_bool(parm, 'patch', False):
+		if not 'apply' in parm and not 'patch' in parm:
 			# The "destdir" handling was specifically done for FILESPATH
 			# items.  So, only do so for file:// entries.
 			if type == "file":