diff options
| author | Chris Larson <chris_larson@mentor.com> | 2010-12-08 14:30:33 -0500 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2011-01-04 14:46:47 +0000 |
| commit | 825e5045f40185666605392138289448e33ec72d (patch) | |
| tree | 37ffa7fb4a139f7c6bc7801ed016d66c0aa1ce29 /bitbake/lib/bb/command.py | |
| parent | ac4d926f413b127810130ad7a442e6daf1fdd1b9 (diff) | |
| download | openembedded-core-825e5045f40185666605392138289448e33ec72d.tar.gz openembedded-core-825e5045f40185666605392138289448e33ec72d.tar.bz2 openembedded-core-825e5045f40185666605392138289448e33ec72d.zip | |
cooker: merge cookerState and cookerAction
(Bitbake rev: c7c8945ef7ca9465312e630b7fa5f0a87ac8b6c7)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/command.py')
| -rw-r--r-- | bitbake/lib/bb/command.py | 7 |
1 files changed, 4 insertions, 3 deletions
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): """ |