Revert the '-' character fix in class names since it breaks things

diff --git a/ChangeLog b/ChangeLog
index 3cb500f..3890e22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,7 @@ Changes in BitBake 1.8.x:
        - Correctly handle '-' characters in class names (#2958)
        - Make sure expandKeys has been called on the data dictonary before running tasks
        - Correctly add a task override in the form task-TASKNAME.
+       - 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/lib/bb/parse/parse_py/BBHandler.py b/lib/bb/parse/parse_py/BBHandler.py
index 764def8..d7bf6d4 100644 (file)
--- 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.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