From: Ed Bartosh <ed.bartosh@linux.intel.com>
Date: Mon, 4 Jan 2016 09:26:34 +0000 (+0200)
Subject: uievent: refactor retry loop
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e1e497c8432536b3522295e5b1284844ccea056;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

uievent: refactor retry loop

Replaced 'while' loop with 'for' loop.
Made the code more compact and hopefully more understandable.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/ui/uievent.py b/lib/bb/ui/uievent.py
index a900555e33b..df22e253ca6 100644
--- a/lib/bb/ui/uievent.py
+++ b/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