build.py: Make sure expandKeys has been called on the data dictonary before running...

diff --git a/ChangeLog b/ChangeLog
index d1a6620..3cb500f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,8 @@ Changes in BitBake 1.8.x:
        - Add md5 and sha256 checksum generation functions to utils.py
        - Make sure Build Completed events are generated even when tasks fail
        - 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.
 
 Changes in BitBake 1.8.10:
        - Psyco is available only for x86 - do not use it on other architectures.

diff --git a/lib/bb/build.py b/lib/bb/build.py
index 25c03a0..7644bf0 100644 (file)
--- a/lib/bb/build.py
+++ b/lib/bb/build.py
@@ -271,8 +271,9 @@ def exec_task(task, d):
         bb.msg.debug(1, bb.msg.domain.Build, "Executing task %s" % task)
         old_overrides = data.getVar('OVERRIDES', d, 0)
         localdata = data.createCopy(d)
-        data.setVar('OVERRIDES', 'task_%s:%s' % (task, old_overrides), localdata)
+        data.setVar('OVERRIDES', 'task-%s:%s' % (task[3:], old_overrides), localdata)
         data.update_data(localdata)
+        data.expandKeys(localdata)
         event.fire(TaskStarted(task, localdata))
         exec_func(task, localdata)
         event.fire(TaskSucceeded(task, localdata))