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 | poky-825e5045f40185666605392138289448e33ec72d.tar.gz |
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: | |||
81 | (command, options) = self.currentAsyncCommand | 81 | (command, options) = self.currentAsyncCommand |
82 | commandmethod = getattr(CommandsAsync, command) | 82 | commandmethod = getattr(CommandsAsync, command) |
83 | needcache = getattr( commandmethod, "needcache" ) | 83 | needcache = getattr( commandmethod, "needcache" ) |
84 | if needcache and self.cooker.cookerState != bb.cooker.cookerParsed: | 84 | if (needcache and self.cooker.state in |
85 | (bb.cooker.state.initial, bb.cooker.state.parsing)): | ||
85 | self.cooker.updateCache() | 86 | self.cooker.updateCache() |
86 | return True | 87 | return True |
87 | else: | 88 | else: |
@@ -123,13 +124,13 @@ class CommandsSync: | |||
123 | """ | 124 | """ |
124 | Trigger cooker 'shutdown' mode | 125 | Trigger cooker 'shutdown' mode |
125 | """ | 126 | """ |
126 | command.cooker.cookerAction = bb.cooker.cookerShutdown | 127 | command.cooker.state = bb.cooker.state.shutdown |
127 | 128 | ||
128 | def stateStop(self, command, params): | 129 | def stateStop(self, command, params): |
129 | """ | 130 | """ |
130 | Stop the cooker | 131 | Stop the cooker |
131 | """ | 132 | """ |
132 | command.cooker.cookerAction = bb.cooker.cookerStop | 133 | command.cooker.state = bb.cooker.state.stop |
133 | 134 | ||
134 | def getCmdLineAction(self, command, params): | 135 | def getCmdLineAction(self, command, params): |
135 | """ | 136 | """ |