From ac5931ec6710eebd9b5fa60f1c3c30f1ac4301f9 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 27 May 2010 13:07:35 -0700 Subject: Revert "base.bbclass: fixed 'apply=no' behavior" This reverts commit eb8ad2af3a59dc7b4c64814815fc13977efaec6b. --- classes/base.bbclass | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index a36fcbf95a..8bac509115 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": -- cgit 1.2.3-korg