diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-19 14:48:19 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-19 14:48:19 +0000 |
commit | 22a271aaa99daeb6b29c42c2c1dc670bf204310e (patch) | |
tree | d2690b66e7a613820f34ceaecbce65809cbd22a3 /bitbake-dev/lib/bb/build.py | |
parent | cefe87fc3c4202e942f34666813bc094df2ffb4b (diff) | |
download | openembedded-core-22a271aaa99daeb6b29c42c2c1dc670bf204310e.tar.gz openembedded-core-22a271aaa99daeb6b29c42c2c1dc670bf204310e.tar.bz2 openembedded-core-22a271aaa99daeb6b29c42c2c1dc670bf204310e.zip |
bitbake-dev: Sync with upstream
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake-dev/lib/bb/build.py')
-rw-r--r-- | bitbake-dev/lib/bb/build.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake-dev/lib/bb/build.py b/bitbake-dev/lib/bb/build.py index 65e8118b4f..6d80b4b549 100644 --- a/bitbake-dev/lib/bb/build.py +++ b/bitbake-dev/lib/bb/build.py @@ -55,7 +55,7 @@ class TaskBase(event.Event): def __init__(self, t, d ): self._task = t self._package = bb.data.getVar("PF", d, 1) - event.Event.__init__(self, d) + event.Event.__init__(self) self._message = "package %s: task %s: %s" % (bb.data.getVar("PF", d, 1), t, bb.event.getName(self)[4:]) def getTask(self): @@ -286,9 +286,9 @@ def exec_task(task, d): data.setVar('OVERRIDES', 'task-%s:%s' % (task[3:], old_overrides), localdata) data.update_data(localdata) data.expandKeys(localdata) - event.fire(TaskStarted(task, localdata)) + event.fire(TaskStarted(task, localdata), localdata) exec_func(task, localdata) - event.fire(TaskSucceeded(task, localdata)) + event.fire(TaskSucceeded(task, localdata), localdata) except FuncFailed, message: # Try to extract the optional logfile try: @@ -298,7 +298,7 @@ def exec_task(task, d): msg = message bb.msg.note(1, bb.msg.domain.Build, "Task failed: %s" % message ) failedevent = TaskFailed(msg, logfile, task, d) - event.fire(failedevent) + event.fire(failedevent, d) raise EventException("Function failed in task: %s" % message, failedevent) # make stamp, or cause event and raise exception |