diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rwxr-xr-x | bin/bitbake | 4 | ||||
| -rw-r--r-- | lib/bb/__init__.py | 2 | ||||
| -rw-r--r-- | lib/bb/parse/parse_py/BBHandler.py | 6 |
4 files changed, 10 insertions, 5 deletions
@@ -1,4 +1,7 @@ Changes in BitBake 1.6.7: + - Make sure __inherit_cache is updated before calling include() (from Michael Krelin) + - Raise ParseError for filenames with multiple underscores instead of infinitely looping (#2062) + - Fix invalid regexp in BBMASK error handling (missing import) (#1124) Changes in BitBake 1.6.5: - Update the MANIFEST file diff --git a/bin/bitbake b/bin/bitbake index 6aa43023e..ba69b5eff 100755 --- a/bin/bitbake +++ b/bin/bitbake @@ -27,11 +27,11 @@ sys.path.insert(0,os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'l import bb from bb import utils, data, parse, event, cache, providers from sets import Set -import itertools, optparse +import itertools, optparse, sre_constants parsespin = itertools.cycle( r'|/-\\' ) -__version__ = "1.6.7" +__version__ = "1.6.8" #============================================================================# # BBParsingStatus diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py index b70a06440..eba72fc71 100644 --- a/lib/bb/__init__.py +++ b/lib/bb/__init__.py @@ -21,7 +21,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -__version__ = "1.6.7" +__version__ = "1.6.8" __all__ = [ diff --git a/lib/bb/parse/parse_py/BBHandler.py b/lib/bb/parse/parse_py/BBHandler.py index cbc88970d..ed4d2d900 100644 --- a/lib/bb/parse/parse_py/BBHandler.py +++ b/lib/bb/parse/parse_py/BBHandler.py @@ -66,9 +66,9 @@ def inherit(files, d): if not file in __inherit_cache.split(): debug(2, "BB %s:%d: inheriting %s" % (fn, lineno, file)) __inherit_cache += " %s" % file + data.setVar('__inherit_cache', __inherit_cache, d) include(fn, file, d) - 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__, __bbpath_found__, __residue__ @@ -367,6 +367,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: |