diff options
| -rw-r--r-- | lib/bb/server/xmlrpc.py | 17 | ||||
| -rw-r--r-- | lib/bb/ui/uievent.py | 4 |
2 files changed, 10 insertions, 11 deletions
diff --git a/lib/bb/server/xmlrpc.py b/lib/bb/server/xmlrpc.py index 46d074a73..bf867b584 100644 --- a/lib/bb/server/xmlrpc.py +++ b/lib/bb/server/xmlrpc.py @@ -89,7 +89,7 @@ class BitBakeServerCommands(): self.server = server self.has_client = False - def registerEventHandler(self, host, port, featureset = []): + def registerEventHandler(self, host, port): """ Register a remote UI Event Handler """ @@ -99,13 +99,6 @@ class BitBakeServerCommands(): if (self.cooker.state in [bb.cooker.state.parsing, bb.cooker.state.running]): return None - original_featureset = list(self.cooker.featureset) - for f in featureset: - self.cooker.featureset.setFeature(f) - - if (original_featureset != list(self.cooker.featureset)): - self.cooker.reset() - self.event_handle = bb.event.register_UIHhandler(s) return self.event_handle @@ -293,9 +286,15 @@ class BitBakeXMLRPCServerConnection(BitBakeBaseServerConnection): return None self.transport.set_connection_token(token) - self.events = uievent.BBUIEventQueue(self.connection, self.clientinfo, self.featureset) + self.events = uievent.BBUIEventQueue(self.connection, self.clientinfo) for event in bb.event.ui_queue: self.events.queue_event(event) + + _, error = self.connection.runCommand(["setFeatures", self.featureset]) + if error: + logger.error("Unable to set the cooker to the correct featureset: %s" % error) + raise BaseException(error) + return self def removeClient(self): diff --git a/lib/bb/ui/uievent.py b/lib/bb/ui/uievent.py index 2133b4447..98658f68b 100644 --- a/lib/bb/ui/uievent.py +++ b/lib/bb/ui/uievent.py @@ -28,7 +28,7 @@ import socket, threading, pickle from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler class BBUIEventQueue: - def __init__(self, BBServer, clientinfo=("localhost, 0"), featureset=[]): + def __init__(self, BBServer, clientinfo=("localhost, 0")): self.eventQueue = [] self.eventQueueLock = threading.Lock() @@ -44,7 +44,7 @@ class BBUIEventQueue: server.register_function( self.send_event, "event.sendpickle" ) server.socket.settimeout(1) - self.EventHandle = self.BBServer.registerEventHandler(self.host, self.port, featureset) + self.EventHandle = self.BBServer.registerEventHandler(self.host, self.port) if (self.EventHandle == None): bb.fatal("Could not register UI event handler") |