summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib')
-rwxr-xr-xbitbake/lib/bb/main.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py
index 7990195eac..e92e409f07 100755
--- a/bitbake/lib/bb/main.py
+++ b/bitbake/lib/bb/main.py
@@ -456,15 +456,17 @@ def setup_bitbake(configParams, extrafeatures=None):
456 break 456 break
457 except BBMainFatal: 457 except BBMainFatal:
458 raise 458 raise
459 except (Exception, bb.server.process.ProcessTimeout) as e: 459 except (Exception, bb.server.process.ProcessTimeout, SystemExit) as e:
460 # SystemExit does not inherit from the Exception class, needs to be included explicitly
460 if not retries: 461 if not retries:
461 raise 462 raise
462 retries -= 1 463 retries -= 1
463 tryno = 8 - retries 464 tryno = 8 - retries
464 if isinstance(e, (bb.server.process.ProcessTimeout, BrokenPipeError, EOFError)): 465 if isinstance(e, (bb.server.process.ProcessTimeout, BrokenPipeError, EOFError, SystemExit)):
465 logger.info("Retrying server connection (#%d)..." % tryno) 466 logger.info("Retrying server connection (#%d)..." % tryno)
466 else: 467 else:
467 logger.info("Retrying server connection (#%d)... (%s)" % (tryno, traceback.format_exc())) 468 logger.info("Retrying server connection (#%d)... (%s)" % (tryno, traceback.format_exc()))
469
468 if not retries: 470 if not retries:
469 bb.fatal("Unable to connect to bitbake server, or start one (server startup failures would be in bitbake-cookerdaemon.log).") 471 bb.fatal("Unable to connect to bitbake server, or start one (server startup failures would be in bitbake-cookerdaemon.log).")
470 bb.event.print_ui_queue() 472 bb.event.print_ui_queue()