summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/cooker.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-02 15:46:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-07 16:14:33 +0100
commit5e0124f00d4e50dd84f988b1d8c4ff40b0e1b371 (patch)
treef6882364f45c121c584ddfcd0abbb4a09fa4b547 /bitbake/lib/bb/cooker.py
parent2806646a263527ec0487ea160afd4bdc0a3c1703 (diff)
downloadpoky-5e0124f00d4e50dd84f988b1d8c4ff40b0e1b371.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 rev: 9c52c73fd2498e65be5f0da24dc2ae3803eb42eb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r--bitbake/lib/bb/cooker.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 7ca1ffdd94..c39d522c47 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1353,7 +1353,10 @@ class BBCooker:
1353 # Empty the environment. The environment will be populated as 1353 # Empty the environment. The environment will be populated as
1354 # necessary from the data store. 1354 # necessary from the data store.
1355 #bb.utils.empty_environment() 1355 #bb.utils.empty_environment()
1356 prserv.serv.auto_start(self.configuration.data) 1356 try:
1357 prserv.serv.auto_start(self.configuration.data)
1358 except prserv.serv.PRServiceConfigError:
1359 bb.event.fire(CookerExit(), self.configuration.event_data)
1357 return 1360 return
1358 1361
1359 def post_serve(self): 1362 def post_serve(self):