diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2008-05-19 20:16:03 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-05-19 20:16:03 +0000 |
commit | cde4e4f6a65aa8532f066cdd2e240bbe06995d0c (patch) | |
tree | 6b3462881ae0227c9d035fede121853ae72d4eed | |
parent | 4c0b17f16b58b3fad56bc6c3857c411ce58992e4 (diff) | |
download | bitbake-contrib-cde4e4f6a65aa8532f066cdd2e240bbe06995d0c.tar.gz |
BBHandler.py: Correctly handle '-' characters in class names (#2958)
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | lib/bb/parse/parse_py/BBHandler.py | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -137,6 +137,7 @@ Changes in Bitbake 1.9.x: - Add PERSISTENT_DIR to store the PersistData in a persistent directory != the cache dir. - Add md5 and sha256 checksum generation functions to utils.py + - Correctly handle '-' characters in class names (#2958) Changes in Bitbake 1.8.0: - Release 1.7.x as a stable series diff --git a/lib/bb/parse/parse_py/BBHandler.py b/lib/bb/parse/parse_py/BBHandler.py index e9b950acb..794a865ca 100644 --- a/lib/bb/parse/parse_py/BBHandler.py +++ b/lib/bb/parse/parse_py/BBHandler.py @@ -93,7 +93,7 @@ def handle(fn, d, include = 0): init(d) if ext == ".bbclass": - __classname__ = root + __classname__ = root.replace('-','_') classes.append(__classname__) __inherit_cache = data.getVar('__inherit_cache', d) or [] if not fn in __inherit_cache: @@ -249,7 +249,7 @@ def feeder(lineno, s, fn, root, d): m = __func_start_regexp__.match(s) if m: - __infunc__ = m.group("func") or "__anonymous" + __infunc__ = (m.group("func") or "__anonymous").replace('-','_') key = __infunc__ if data.getVar(key, d): # clean up old version of this piece of metadata, as its |