summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-08 09:41:03 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-11 17:36:50 +0000
commit289ccaa24ddf64375940d1794dd567f4f4b7b33b (patch)
treed9a174e3fa41e589a9303d58534cff21f7e6f465 /bitbake
parent646cd97d248b2391101e3108a8f3ecd11a5210db (diff)
downloadpoky-289ccaa24ddf64375940d1794dd567f4f4b7b33b.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: 923fc5ee0ace02cc29110bff502a2c65e6bdebf0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/cooker.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index a900b07a80..8e6d91bc50 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1286,7 +1286,7 @@ class BBCooker:
1286 if self.state == state.running: 1286 if self.state == state.running:
1287 return 1287 return
1288 1288
1289 if self.state in (state.shutdown, state.forceshutdown): 1289 if self.state in (state.shutdown, state.forceshutdown, state.error):
1290 if hasattr(self.parser, 'shutdown'): 1290 if hasattr(self.parser, 'shutdown'):
1291 self.parser.shutdown(clean=False, force = True) 1291 self.parser.shutdown(clean=False, force = True)
1292 raise bb.BBHandledException() 1292 raise bb.BBHandledException()