From 825e5045f40185666605392138289448e33ec72d Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 8 Dec 2010 14:30:33 -0500 Subject: cooker: merge cookerState and cookerAction (Bitbake rev: c7c8945ef7ca9465312e630b7fa5f0a87ac8b6c7) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/command.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb/command.py') diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py index 9a8d689e2a..654ede0e85 100644 --- a/bitbake/lib/bb/command.py +++ b/bitbake/lib/bb/command.py @@ -81,7 +81,8 @@ class Command: (command, options) = self.currentAsyncCommand commandmethod = getattr(CommandsAsync, command) needcache = getattr( commandmethod, "needcache" ) - if needcache and self.cooker.cookerState != bb.cooker.cookerParsed: + if (needcache and self.cooker.state in + (bb.cooker.state.initial, bb.cooker.state.parsing)): self.cooker.updateCache() return True else: @@ -123,13 +124,13 @@ class CommandsSync: """ Trigger cooker 'shutdown' mode """ - command.cooker.cookerAction = bb.cooker.cookerShutdown + command.cooker.state = bb.cooker.state.shutdown def stateStop(self, command, params): """ Stop the cooker """ - command.cooker.cookerAction = bb.cooker.cookerStop + command.cooker.state = bb.cooker.state.stop def getCmdLineAction(self, command, params): """ -- cgit v1.2.3-54-g00ecf