extras-buildsys/server PackageJob.py, 1.46, 1.47 ArchJob.py, 1.28, 1.29

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	PackageJob.py ArchJob.py 
Log Message:
2006-05-08  Dan Williams  <dcbw at redhat.com>

    * server/PackageJob.py
        - (_request_one_arch_job): Use the correct fileserver port

    * server/ArchJob.py
        - (_status_repo_unlock): fix unknown variable, should be self.job

    * common/URLopener.py
        - import socket to fix an unknown type

    * common/FileUploader.py
        - (__init__): don't need to pass url in as each subclass keeps
            track of the url itself

    * common/FileTransfer.py
        - (__init__): don't keep track of url as each subclass needs
            to do this separately; Fix indentation of self._certs to make
            sure it gets set even if it's None

    * common/FileDownloader.py
        - (__init__): don't need to pass url in as each subclass keeps
            track of the url itself; in our case it's actually a list of
            urls.  Make sure self._files is defined, and has at least one
            item too.

    * common/Commands.py
        - (deserialize_command_stream): don't let unknown commands into
            the deserialized command stream; they show up as None items
            in the returned list.
        - (PlgCommand.deserialize): deserialize PlgCommandUnlockRepo commands
            too




Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- PackageJob.py	3 May 2006 04:04:28 -0000	1.46
+++ PackageJob.py	9 May 2006 02:52:58 -0000	1.47
@@ -639,11 +639,12 @@
     def _request_one_arch_job(self, arch, orphaned):
         # Construct SPRM URL
         srpm_http_base = self._srpm_http_path[len(self.http_dir):]
-        method = "http://"
+        method = "http"
         if self._server_cfg.get_bool("Builders", "use_ssl") == True:
-            method = "https://"
+            method = "https"
         hostname = self._server_cfg.get_str("General", "hostname")
-        srpm_url = method + hostname + ":8886/" + srpm_http_base
+        port = self._server_cfg.get_int("Active Builders", "file_server_port")
+        srpm_url = "%s://%s:%d/%s" % (method, hostname, port, srpm_http_base)
         target_dict = self._target_cfg.target_dict(arch)
         self.bm.builder_manager.request_arch_job(self, target_dict, srpm_url, orphaned)
 


Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ArchJob.py	3 May 2006 04:04:28 -0000	1.28
+++ ArchJob.py	9 May 2006 02:52:58 -0000	1.29
@@ -169,7 +169,7 @@
     def _status_repo_unlock(self):
         # Builder will be in 'downloaded' state until
         # it notices that the repo has been unlocked 
-        self._builder.unlock_repo_for_job(self._uniqid)
+        self._builder.unlock_repo_for_job(self.jobid)
         self._prepping = True
         if self._builder_status != 'downloaded':
             self._set_status('running')