diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-08 09:41:03 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-08 09:42:24 +0000 |
commit | 1393e224b51d07297f615cc53dab4ef3bab72770 (patch) | |
tree | 3b7f72eb850172478d87dad9c47617130c431476 /bitbake | |
parent | cbb4f578009535322f0f81c1173e32567be5e6f3 (diff) | |
download | poky-1393e224b51d07297f615cc53dab4ef3bab72770.tar.gz |
bitbake: cooker: Shut down the parser in error state
If the cooker is in an error state, we shouldn't continue to try parsing.
This fixes an issue where an invalid PR server is detected when bitbake
is started and ensures bitbake exits cleanly rather than hanging.
[YOCTO #6934]
(Bitbake rev: 294bb9cad294423d4f8998405ceff58655f12660)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 0d9b85e604..23e7abda39 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -1355,7 +1355,7 @@ class BBCooker: | |||
1355 | if self.state == state.running: | 1355 | if self.state == state.running: |
1356 | return | 1356 | return |
1357 | 1357 | ||
1358 | if self.state in (state.shutdown, state.forceshutdown): | 1358 | if self.state in (state.shutdown, state.forceshutdown, state.error): |
1359 | if hasattr(self.parser, 'shutdown'): | 1359 | if hasattr(self.parser, 'shutdown'): |
1360 | self.parser.shutdown(clean=False, force = True) | 1360 | self.parser.shutdown(clean=False, force = True) |
1361 | raise bb.BBHandledException() | 1361 | raise bb.BBHandledException() |