From: Ed Bartosh <ed.bartosh@linux.intel.com>
Date: Wed, 6 Apr 2016 16:46:15 +0000 (+0100)
Subject: uievent: improve BBUIEventQueue code
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f356c154016c428a3b53af61a075de6f14d9d1d9;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

uievent: improve BBUIEventQueue code

Return value of self.BBServer.registerEventHandler differs between
jethro and master. To be able to build jethro toaster should be
able to communicate with jethro bitbake server i.e. it must work
with both old and new registerEventHandler call.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Michael Wood <michael.g.wood@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 6b479bfa54c..df093c53c06 100644
--- a/lib/bb/ui/uievent.py
+++ b/lib/bb/ui/uievent.py
@@ -24,7 +24,7 @@ server and queue them for the UI to process. This process must be used to avoid
 client/server deadlocks.
 """
 
-import socket, threading, pickle
+import socket, threading, pickle, collections
 from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler
 
 class BBUIEventQueue:
@@ -51,7 +51,13 @@ class BBUIEventQueue:
         # giving up
 
         for count_tries in range(5):
-            self.EventHandle, error = self.BBServer.registerEventHandler(self.host, self.port)
+            ret = self.BBServer.registerEventHandler(self.host, self.port)
+
+            if isinstance(ret, collections.Iterable):
+                self.EventHandle, error = ret
+            else:
+                self.EventHandle = ret
+                error = ""
 
             if self.EventHandle != None:
                 break