diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-26 12:41:03 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-26 13:43:47 +0100 |
| commit | c34bb765fa79e82ea31d0e1b09263c4394f7c37b (patch) | |
| tree | aa1407ee7dd8c16afce3e61b837ffdabc67dbba3 /bitbake/lib | |
| parent | 1dff47b097615771bc144f14c31ea137aa562c70 (diff) | |
| download | ast2050-yocto-poky-c34bb765fa79e82ea31d0e1b09263c4394f7c37b.zip ast2050-yocto-poky-c34bb765fa79e82ea31d0e1b09263c4394f7c37b.tar.gz | |
bitbake: command.py: Call updateCache for all states != running
updateCache handles the logic for shutting down the parsing so we need
to call it for all cases when we're not running.
This fixes hangs if Ctrl+C is pressed during parsing.
(Bitbake rev: 552b8935dd2f9f11e8d5c08a597a7e966b891480)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
| -rw-r--r-- | bitbake/lib/bb/command.py | 3 | ||||
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py index bdf1c36..3527ad0 100644 --- a/bitbake/lib/bb/command.py +++ b/bitbake/lib/bb/command.py @@ -90,8 +90,7 @@ class Command: (command, options) = self.currentAsyncCommand commandmethod = getattr(CommandsAsync, command) needcache = getattr( commandmethod, "needcache" ) - if (needcache and self.cooker.state in - (bb.cooker.state.initial, bb.cooker.state.parsing)): + if needcache and self.cooker.state != bb.cooker.state.running: self.cooker.updateCache() return True else: diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 97210ba..5a84804 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -1168,6 +1168,7 @@ class BBCooker: if timestamp: return timestr + # This is called for all async commands when self.state != running def updateCache(self): if self.state == state.running: return |
