diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-06 13:42:39 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-14 16:59:12 +0100 |
commit | 3ca820de91c2456a1b1c44022072f6ce7aa21344 (patch) | |
tree | 17e8e2fee1633549eb9f5b7226f63df138ad303c /bitbake/lib/bb/cooker.py | |
parent | f41922d0c787a73b4b84de783d0720d13ededec4 (diff) | |
download | poky-3ca820de91c2456a1b1c44022072f6ce7aa21344.tar.gz |
bitbake: cooker/command: Add error state for the server and use for pre_serve errors
Currently if errors occur when starting the PR service, there is a race that
occurs since the UI runs various commands including starting builds before
processing the CookerExit(). By adding the error state and refusing to run
async commands in this mode, builds are prevented from starting and the
UI reaches the exit code with the system shutting down cleanly.
(Bitbake rev: 42fa34142ea685f91115a551e74416ca28ef1c91)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index ad36b34aa4..b504f45da6 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -61,7 +61,7 @@ class CollectionError(bb.BBHandledException): | |||
61 | """ | 61 | """ |
62 | 62 | ||
63 | class state: | 63 | class state: |
64 | initial, parsing, running, shutdown, forceshutdown, stopped = range(6) | 64 | initial, parsing, running, shutdown, forceshutdown, stopped, error = range(7) |
65 | 65 | ||
66 | 66 | ||
67 | class SkippedPackage: | 67 | class SkippedPackage: |
@@ -1321,6 +1321,7 @@ class BBCooker: | |||
1321 | self.prhost = prserv.serv.auto_start(self.data) | 1321 | self.prhost = prserv.serv.auto_start(self.data) |
1322 | except prserv.serv.PRServiceConfigError: | 1322 | except prserv.serv.PRServiceConfigError: |
1323 | bb.event.fire(CookerExit(), self.event_data) | 1323 | bb.event.fire(CookerExit(), self.event_data) |
1324 | self.state = state.error | ||
1324 | return | 1325 | return |
1325 | 1326 | ||
1326 | def post_serve(self): | 1327 | def post_serve(self): |