bitbake: Sync with upstream

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4504 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 12 insertions, 2 deletions

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 619791f174..8e6acb19fc 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -509,8 +509,11 @@ class BBCooker:
         try:
             failures = rq.execute_runqueue()
         except runqueue.TaskFailure, fnids:
+            failures = 0
             for fnid in fnids:
                 bb.msg.error(bb.msg.domain.Build, "'%s' failed" % taskdata.fn_index[fnid])
+                failures = failures + 1
+            bb.event.fire(bb.event.BuildCompleted(buildname, [item], self.configuration.event_data, failures))
             return False
         bb.event.fire(bb.event.BuildCompleted(buildname, [item], self.configuration.event_data, failures))
         return True
@@ -543,8 +546,11 @@ class BBCooker:
         try:
             failures = rq.execute_runqueue()
         except runqueue.TaskFailure, fnids:
+            failures = 0
             for fnid in fnids:
                 bb.msg.error(bb.msg.domain.Build, "'%s' failed" % taskdata.fn_index[fnid])
+                failures = failures + 1
+            bb.event.fire(bb.event.BuildCompleted(buildname, targets, self.configuration.event_data, failures))
             sys.exit(1)
         bb.event.fire(bb.event.BuildCompleted(buildname, targets, self.configuration.event_data, failures))
 
diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py
index c0a59e6120..fb99c3912d 100644
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -230,6 +230,10 @@ class BuildStarted(BuildBase):
     """bbmake build run started"""
 
 
+class BuildFailed(BuildBase):
+    """bbmake build run failed"""
+
+
 class BuildCompleted(BuildBase):
     """bbmake build run completed"""
 
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index d7bf6d4f37..764def8ec0 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
+        __classname__ = root.replace('-','_')
         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"
+        __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