diff options
| author | Chris Larson <chris_larson@mentor.com> | 2010-05-27 13:07:35 -0700 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2010-05-27 13:07:35 -0700 |
| commit | ac5931ec6710eebd9b5fa60f1c3c30f1ac4301f9 (patch) | |
| tree | 70a28b644238277a5ff97f07d3c484ebbb439063 /classes/base.bbclass | |
| parent | 7cb990de933f22331cd701ecb45d1e30dd8f3c11 (diff) | |
Revert "base.bbclass: fixed 'apply=no' behavior"
This reverts commit eb8ad2af3a59dc7b4c64814815fc13977efaec6b.
Diffstat (limited to 'classes/base.bbclass')
| -rw-r--r-- | classes/base.bbclass | 5 |
1 files changed, 1 insertions, 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": |