extras-buildsys/builder builder.py,1.12,1.13

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12644/builder

Modified Files:
	builder.py 
Log Message:
2005-07-12  Dan Williams <dcbw at redhat.com>

    * Warn user and exit if server or builder is already running

    * Add aliasing/mapping of plague targets to CVS targets, to
        allow for different CVS directory names than what our
        targets are




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- builder.py	10 Jul 2005 07:17:14 -0000	1.12
+++ builder.py	12 Jul 2005 20:12:30 -0000	1.13
@@ -678,10 +678,16 @@
 
     print "Binding to address '%s' with arches: [%s]" % (g_our_hostname, string.join(localarches))
     xmlrpc_port = config_opts['xmlrpc_port']
-    if config_opts['ssl_buildserver']:
-        xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((g_our_hostname, xmlrpc_port), None, certs)
-    else:
-        xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((g_our_hostname, xmlrpc_port), None)
+    try:
+        if config_opts['ssl_buildserver']:
+            xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((g_our_hostname, xmlrpc_port), None, certs)
+        else:
+            xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((g_our_hostname, xmlrpc_port), None)
+    except socket.error, e:
+        if e[0] == 98:
+            print "Error: couldn't bind to address '%s:%s'.  Is the builder already running?" % (g_our_hostname, xmlrpc_port)
+            os._exit(1)
+
     bcs = XMLRPCBuilderServer(localarches)
     xmlserver.register_instance(bcs)