diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-20 16:20:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-20 23:58:05 +0100 |
commit | c0c46125b6a392fd3f1f0f6cae83fedb2c86acc8 (patch) | |
tree | 458b9e0799b8e70a69c9937391b03084bdd19a2d /bitbake/lib/bb | |
parent | 2d31fa1a7fb99dc321fb224b3108d0ba09f884c6 (diff) | |
download | poky-c0c46125b6a392fd3f1f0f6cae83fedb2c86acc8.tar.gz |
bitbake: prserv/cooker: Handle PRService errors cleanly
Current if the PR Service fails to start, bitbake carries on regardless or
hangs with no error message. This adds an exception and then handles it correctly
so the UIs correctly handle the error and exit cleanly.
[YOCTO #4010]
(Bitbake master rev: 949c01228a977c3b92bfc0802f6c71b40d8e05b3)
(Bitbake rev: c21c3fd3adc7bbbd7018a03e99f058b05bec10b2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index c7c2ca6483..2c54209f89 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -1486,7 +1486,10 @@ class BBCooker: | |||
1486 | # Empty the environment. The environment will be populated as | 1486 | # Empty the environment. The environment will be populated as |
1487 | # necessary from the data store. | 1487 | # necessary from the data store. |
1488 | #bb.utils.empty_environment() | 1488 | #bb.utils.empty_environment() |
1489 | prserv.serv.auto_start(self.configuration.data) | 1489 | try: |
1490 | prserv.serv.auto_start(self.configuration.data) | ||
1491 | except prserv.serv.PRServiceConfigError: | ||
1492 | bb.event.fire(CookerExit(), self.configuration.event_data) | ||
1490 | return | 1493 | return |
1491 | 1494 | ||
1492 | def post_serve(self): | 1495 | def post_serve(self): |