Переглянути джерело

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

Richard Purdie 16 роки тому
батько
коміт
1501addb04
2 змінених файлів з 3 додано та 2 видалено
  1. 1 0
      ChangeLog
  2. 2 2
      lib/bb/parse/parse_py/BBHandler.py

+ 1 - 0
ChangeLog

@@ -140,6 +140,7 @@ Changes in Bitbake 1.9.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.0:
 	- Release 1.7.x as a stable series

+ 2 - 2
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:
@@ -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").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