bitbake: main: When retrying the connection, show the attempt number

The current bitbake output makes it hard to know which retry is being
attempted. Add this information to the output to make it clearer.

(Bitbake rev: 0774e6e03d27adb7aca6fa9c47ab6ad426c937de)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py
index 7dc953da665b444fe091eed685431286107db451..41dd3b9e03ac85a06b369e4bf639e46c7f765b95 100755 (executable)
--- a/bitbake/lib/bb/main.py
+++ b/bitbake/lib/bb/main.py
@@ -475,10 +475,11 @@ def setup_bitbake(configParams, configuration, extrafeatures=None):
                 if not retries:
                     raise
                 retries -= 1
+                tryno = 8 - retries
                 if isinstance(e, (bb.server.process.ProcessTimeout, BrokenPipeError)):
-                    logger.info("Retrying server connection...")
+                    logger.info("Retrying server connection (#%d)..." % tryno)
                 else:
-                    logger.info("Retrying server connection... (%s)" % traceback.format_exc())
+                    logger.info("Retrying server connection (#%d)... (%s)" % (tryno, traceback.format_exc()))
             if not retries:
                 bb.fatal("Unable to connect to bitbake server, or start one")
             if retries < 5: