From fc49a6f00fc1ae3430ab3eb9615472efff0a7fce Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 28 Mar 2014 17:06:43 +0000 Subject: bitbake: server/xmlrpc: Simlify featureset handling Rather than passing featureset around various places where the data doesn't really belong, run a command at connection time to set the appropriate features. This is similar to what the process server does. (Bitbake rev: c3b5cc5691291c74dd315c4439c80e0e4b2b5c1d) Signed-off-by: Richard Purdie --- bitbake/lib/bb/server/xmlrpc.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'bitbake/lib/bb/server') diff --git a/bitbake/lib/bb/server/xmlrpc.py b/bitbake/lib/bb/server/xmlrpc.py index 46d074a738..bf867b584b 100644 --- a/bitbake/lib/bb/server/xmlrpc.py +++ b/bitbake/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): -- cgit v1.2.3-54-g00ecf