extras-buildsys/builder Builder.py,1.11,1.12

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	Builder.py 
Log Message:
Fix errors in passive builder code (patch from Andreas Thienemann <andreas at bawue.net>)


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/Builder.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Builder.py	14 May 2006 05:43:06 -0000	1.11
+++ Builder.py	14 May 2006 16:13:06 -0000	1.12
@@ -330,14 +330,15 @@
         # Start up the HTTP server thread which the build server
         # pulls completed RPMs from
         hostname = get_hostname(self._cfg, True)
-        port = cfg.get_int("Passive", "fileserver_port")
+        port = self._cfg.get_int("Passive", "fileserver_port")
+        work_dir = self._cfg.get_str("Directories", "builder_work_dir")
         self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), work_dir, self._certs)
         self._http_server.start()
 
         self._log("Binding to address '%s'\n" % hostname)
-        xmlrpc_port = cfg.get_int("Passive", "xmlrpc_port")
+        xmlrpc_port = self._cfg.get_int("Passive", "xmlrpc_port")
         try:
-            if cfg.get_bool("SSL", "use_ssl") == True:
+            if self._cfg.get_bool("SSL", "use_ssl") == True:
                 self._xmlrpc_server = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, self._certs)
             else:
                 self._xmlrpc_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, xmlrpc_port), None)
@@ -346,7 +347,7 @@
                 raise BuilderInitException("Error: couldn't bind to address '%s:%s'.  "  \
                            "Is the builder already running?\n" % (hostname, xmlrpc_port))
 
-        brh = PassiveBuilderRequestHandler(cfg, self)
+        brh = PassiveBuilderRequestHandler(self._cfg, self)
         self._xmlrpc_server.register_instance(brh)
 
     def work(self):