diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-06-12 10:37:02 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-06-12 10:37:02 +0000 |
| commit | 822ea0e69894d3e6329d29e111b6d14462fbf8a2 (patch) | |
| tree | 401768fe900f2d87730b69fd7a531caf671ec123 | |
| parent | d99418ab4ab6d3f93ab5c41eeaac5f7c280960b9 (diff) | |
| download | openembedded-core-822ea0e69894d3e6329d29e111b6d14462fbf8a2.tar.gz openembedded-core-822ea0e69894d3e6329d29e111b6d14462fbf8a2.tar.bz2 openembedded-core-822ea0e69894d3e6329d29e111b6d14462fbf8a2.tar.xz openembedded-core-822ea0e69894d3e6329d29e111b6d14462fbf8a2.zip | |
bitbake: apply r1075 from upstream to get postinsts working again
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4625 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | bitbake/ChangeLog | 1 | ||||
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/ChangeLog b/bitbake/ChangeLog index 62be6ea12..561b618ae 100644 --- a/bitbake/ChangeLog +++ b/bitbake/ChangeLog @@ -41,6 +41,7 @@ Changes in BitBake 1.8.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 + - Revert the '-' character fix in class names since it breaks things Changes in BitBake 1.8.10: - Psyco is available only for x86 - do not use it on other architectures. diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 764def8ec..d7bf6d4f3 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -93,7 +93,7 @@ def handle(fn, d, include = 0): init(d) if ext == ".bbclass": - __classname__ = root.replace('-','_') + __classname__ = root classes.append(__classname__) __inherit_cache = data.getVar('__inherit_cache', d) or [] if not fn in __inherit_cache: @@ -247,7 +247,7 @@ def feeder(lineno, s, fn, root, d): m = __func_start_regexp__.match(s) if m: - __infunc__ = (m.group("func") or "__anonymous").replace('-','_') + __infunc__ = m.group("func") or "__anonymous" key = __infunc__ if data.getVar(key, d): # clean up old version of this piece of metadata, as its |