summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-04-06 17:46:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-06 23:10:27 +0100
commit61b6b98f40bd92470b01312c54ef9e06e1762e14 (patch)
treea5c820e7fb517d2e0431b495087b8d5d1b7ad86b /bitbake/lib
parent0b0d754950da5606b4ba7c7a8d3a43706ba8fddf (diff)
downloadpoky-61b6b98f40bd92470b01312c54ef9e06e1762e14.tar.gz
bitbake: 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. (Bitbake rev: f356c154016c428a3b53af61a075de6f14d9d1d9) 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>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/ui/uievent.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/bitbake/lib/bb/ui/uievent.py b/bitbake/lib/bb/ui/uievent.py
index 6b479bfa54..df093c53c0 100644
--- a/bitbake/lib/bb/ui/uievent.py
+++ b/bitbake/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
24client/server deadlocks. 24client/server deadlocks.
25""" 25"""
26 26
27import socket, threading, pickle 27import socket, threading, pickle, collections
28from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler 28from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler
29 29
30class BBUIEventQueue: 30class BBUIEventQueue:
@@ -51,7 +51,13 @@ class BBUIEventQueue:
51 # giving up 51 # giving up
52 52
53 for count_tries in range(5): 53 for count_tries in range(5):
54 self.EventHandle, error = self.BBServer.registerEventHandler(self.host, self.port) 54 ret = self.BBServer.registerEventHandler(self.host, self.port)
55
56 if isinstance(ret, collections.Iterable):
57 self.EventHandle, error = ret
58 else:
59 self.EventHandle = ret
60 error = ""
55 61
56 if self.EventHandle != None: 62 if self.EventHandle != None:
57 break 63 break