1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00

bitbake: cooker: Split data from configuration

The reasons for combining these objects is ancient history, it makes
sense to clean things up and separate them out now. This follows on
logically from the configuration cleansups and leads well into the
bitbake-worker changes.

(Bitbake rev: 89ffd62661ebcf2a97ce0c8dfd5e4d5bfbe27de7)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2013-05-30 12:26:58 +00:00
parent 2b2b3e8c34
commit 3e9456322d
3 changed files with 88 additions and 88 deletions
+9 -9
View File
@@ -116,11 +116,11 @@ class Command:
def finishAsyncCommand(self, msg=None, code=None):
if msg:
bb.event.fire(CommandFailed(msg), self.cooker.configuration.event_data)
bb.event.fire(CommandFailed(msg), self.cooker.event_data)
elif code:
bb.event.fire(CommandExit(code), self.cooker.configuration.event_data)
bb.event.fire(CommandExit(code), self.cooker.event_data)
else:
bb.event.fire(CommandCompleted(), self.cooker.configuration.event_data)
bb.event.fire(CommandCompleted(), self.cooker.event_data)
self.currentAsyncCommand = None
@@ -145,22 +145,22 @@ class CommandsSync:
def getVariable(self, command, params):
"""
Read the value of a variable from configuration.data
Read the value of a variable from data
"""
varname = params[0]
expand = True
if len(params) > 1:
expand = params[1]
return command.cooker.configuration.data.getVar(varname, expand)
return command.cooker.data.getVar(varname, expand)
def setVariable(self, command, params):
"""
Set the value of variable in configuration.data
Set the value of variable in data
"""
varname = params[0]
value = str(params[1])
command.cooker.configuration.data.setVar(varname, value)
command.cooker.data.setVar(varname, value)
def setConfig(self, command, params):
"""
@@ -375,7 +375,7 @@ class CommandsAsync:
"""
Parse the .bb files
"""
if bb.fetch.fetcher_compare_revisions(command.cooker.configuration.data):
if bb.fetch.fetcher_compare_revisions(command.cooker.data):
command.finishAsyncCommand(code=1)
else:
command.finishAsyncCommand()
@@ -398,7 +398,7 @@ class CommandsAsync:
Trigger a certain event
"""
event = params[0]
bb.event.fire(eval(event), command.cooker.configuration.data)
bb.event.fire(eval(event), command.cooker.data)
command.currentAsyncCommand = None
triggerEvent.needcache = False