diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-05-22 11:50:37 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-05-22 11:50:37 +0000 |
| commit | d05bcee7f21250854c56fd47b1d5c064ac95efb2 (patch) | |
| tree | 6941498b4a0bf46d89fe441e91f2c57e59dbc915 /bitbake/lib/bb/parse | |
| parent | 6e49fdb6db438a947c0122a350cd223dc1ab12db (diff) | |
| download | openembedded-core-d05bcee7f21250854c56fd47b1d5c064ac95efb2.tar.gz openembedded-core-d05bcee7f21250854c56fd47b1d5c064ac95efb2.tar.bz2 openembedded-core-d05bcee7f21250854c56fd47b1d5c064ac95efb2.tar.xz openembedded-core-d05bcee7f21250854c56fd47b1d5c064ac95efb2.zip | |
bitbake: Merge bugfixes from bitbake-1.8 svn
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1759 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb/parse')
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 2c3931632..20fa60355 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -72,9 +72,9 @@ def inherit(files, d): if not file in __inherit_cache: bb.msg.debug(2, bb.msg.domain.Parsing, "BB %s:%d: inheriting %s" % (fn, lineno, file)) __inherit_cache.append( file ) + data.setVar('__inherit_cache', __inherit_cache, d) include(fn, file, d, "inherit") - data.setVar('__inherit_cache', __inherit_cache, d) - + __inherit_cache = data.getVar('__inherit_cache', d) or [] def handle(fn, d, include = 0): global __func_start_regexp__, __inherit_regexp__, __export_func_regexp__, __addtask_regexp__, __addhandler_regexp__, __infunc__, __body__, __residue__ @@ -377,6 +377,8 @@ def vars_from_file(mypkg, d): myfile = os.path.splitext(os.path.basename(mypkg)) parts = myfile[0].split('_') __pkgsplit_cache__[mypkg] = parts + if len(parts) > 3: + raise ParseError("Unable to generate default variables from the filename: %s (too many underscores)" % mypkg) exp = 3 - len(parts) tmplist = [] while exp != 0: |