extras-buildsys/builder builder.py,1.46,1.47

[Daniel Williams (dcbw)]

Author: dcbw

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

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

    Patch from Alexandr Kanevskiy <kad at crystalowl.net>
    * builder/builder.py
        - Remove unused imports
        - Clean up usage of work_dir and other previous global
            variables now that they are local to the BuilderMock class




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- builder.py	31 Oct 2005 17:00:47 -0000	1.46
+++ builder.py	1 Nov 2005 15:14:58 -0000	1.47
@@ -16,8 +16,6 @@
 # Copyright 2005 Dan Williams <dcbw at redhat.com> and Red Hat, Inc.
 
 
-import SimpleXMLRPCServer
-import xmlrpclib
 import socket
 import os
 import shutil
@@ -99,12 +97,12 @@
         self._mock_log = None
         self.buildroot = self._target_cfg.mock_config()
 
-        work_dir = self._builder_cfg.get_str("Directories", "builder_work_dir")
-        self._result_dir = os.path.join(work_dir, self._uniqid, "result")
+        self._work_dir = self._builder_cfg.get_str("Directories", "builder_work_dir")
+        self._result_dir = os.path.join(self._work_dir, self._uniqid, "result")
         if not os.path.exists(self._result_dir):
             os.makedirs(self._result_dir)
 
-        self._state_dir = os.path.join(work_dir, self._uniqid, "mock-state")
+        self._state_dir = os.path.join(self._work_dir, self._uniqid, "mock-state")
         if not os.path.exists(self._state_dir):
             os.makedirs(self._state_dir)
 
@@ -435,7 +433,7 @@
 
         try:
             srpm_filename = FileDownloader.get_base_filename_from_url(self._srpm_url, ['.src.rpm'])
-            self._srpm_path = os.path.join(work_dir, self._uniqid, "source", srpm_filename)
+            self._srpm_path = os.path.join(self._work_dir, self._uniqid, "source", srpm_filename)
         except FileDownloader.FileNameException, e:
             self._log("ERROR: SRPM file name was invalid.  Message: '%s'\n" % e)
             self._status = 'failed'
@@ -789,8 +787,7 @@
     return max_jobs
 
 
-if __name__ == '__main__':
-
+def main():
     usage = "Usage: %s  [-p <pidfile>] [-l <logfile>] [-d] -c <configfile>" % sys.argv[0]
     parser = OptionParser(usage=usage)
     parser.add_option("-p", "--pidfile", default=None,
@@ -904,3 +901,7 @@
 
     http_server.stop()
     os._exit(0)
+
+
+if __name__ == '__main__':
+    main()