summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-03-06 14:47:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-09 14:33:45 +0000
commit8d87f7040fc25a52d6a2c4822b46799f5ab2c481 (patch)
tree1255e66ca2d0cc9e263109b1bda2210e9b31f4d2
parent69d13dc64c3d1e5d33e6a30c89eabe509d26bdfc (diff)
downloadpoky-8d87f7040fc25a52d6a2c4822b46799f5ab2c481.tar.gz
bitbake: xmlrpcserver: do not connect client on error
We roll back the client connection if some error happens, like during setFeatures, as to leave the server accessible to other clients. (Bitbake rev: 4e4a2ee2f05f8741b2e09263e328420363975b02) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/server/xmlrpc.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/lib/bb/server/xmlrpc.py b/bitbake/lib/bb/server/xmlrpc.py
index 4205a4c35f..afe3dfe5df 100644
--- a/bitbake/lib/bb/server/xmlrpc.py
+++ b/bitbake/lib/bb/server/xmlrpc.py
@@ -299,6 +299,8 @@ class BitBakeXMLRPCServerConnection(BitBakeBaseServerConnection):
299 299
300 _, error = self.connection.runCommand(["setFeatures", self.featureset]) 300 _, error = self.connection.runCommand(["setFeatures", self.featureset])
301 if error: 301 if error:
302 # disconnect the client, we can't make the setFeature work
303 self.connection.removeClient()
302 # no need to log it here, the error shall be sent to the client 304 # no need to log it here, the error shall be sent to the client
303 raise BaseException(error) 305 raise BaseException(error)
304 306