From 05b4fbc947cd2bf9493b74a80d1b58c8ddd480a2 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Mon, 4 Jan 2016 11:26:34 +0200 Subject: bitbake: uievent: refactor retry loop Replaced 'while' loop with 'for' loop. Made the code more compact and hopefully more understandable. (Bitbake rev: 4e1e497c8432536b3522295e5b1284844ccea056) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/uievent.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'bitbake/lib/bb') diff --git a/bitbake/lib/bb/ui/uievent.py b/bitbake/lib/bb/ui/uievent.py index a900555e33..df22e253ca 100644 --- a/bitbake/lib/bb/ui/uievent.py +++ b/bitbake/lib/bb/ui/uievent.py @@ -45,27 +45,24 @@ class BBUIEventQueue: server.socket.settimeout(1) self.EventHandle = None - count_tries = 0 # the event handler registration may fail here due to cooker being in invalid state # this is a transient situation, and we should retry a couple of times before # giving up - while self.EventHandle == None and count_tries < 5: + for count_tries in range(5): self.EventHandle, error = self.BBServer.registerEventHandler(self.host, self.port) - if (self.EventHandle != None): + if self.EventHandle != None: break - errmsg = "Could not register UI event handler. Error: %s, " \ - "host %s, port %d" % (error, self.host, self.port) + errmsg = "Could not register UI event handler. Error: %s, host %s, "\ + "port %d" % (error, self.host, self.port) bb.warn("%s, retry" % errmsg) - count_tries += 1 + import time time.sleep(1) - - - if self.EventHandle == None: + else: raise Exception(errmsg) self.server = server -- cgit v1.2.3-54-g00ecf