From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 4 Oct 2013 13:15:36 +0000 (+0100)
Subject: xmlrpc: Show a better error message for connection failures
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26913202f83fbbecdce95da59515af102bcde4a7;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

xmlrpc: Show a better error message for connection failures

Showing a traceback when unable to connect to a bitbake server is
rather ugly. This change allows us to show a sensible error message.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/server/xmlrpc.py b/lib/bb/server/xmlrpc.py
index 389327a60f4..82c0e8d8a69 100644
--- a/lib/bb/server/xmlrpc.py
+++ b/lib/bb/server/xmlrpc.py
@@ -354,9 +354,12 @@ class BitBakeXMLRPCClient(BitBakeBaseServer):
             s.close()
         except:
             return None
-        self.serverImpl = XMLRPCProxyServer(host, port)
-        self.connection = BitBakeXMLRPCServerConnection(self.serverImpl, (ip, 0), self.observer_only, featureset)
-        return self.connection.connect()
+        try:
+            self.serverImpl = XMLRPCProxyServer(host, port)
+            self.connection = BitBakeXMLRPCServerConnection(self.serverImpl, (ip, 0), self.observer_only, featureset)
+            return self.connection.connect()
+        except Exception as e:
+            bb.fatal("Could not connect to server at %s:%s (%s)" % (host, port, str(e)))
 
     def endSession(self):
         self.connection.removeClient()