]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
xmlrpc: Show a better error message for connection failures
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 4 Oct 2013 13:15:36 +0000 (14:15 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 4 Oct 2013 14:34:13 +0000 (15:34 +0100)
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>
lib/bb/server/xmlrpc.py

index 389327a60f4bb9af210433906273dc0b30179926..82c0e8d8a69cc9b692915a050f0f96d047077802 100644 (file)
@@ -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()