extras-buildsys/common URLopener.py, 1.2, 1.3 FileUploader.py, 1.2, 1.3 FileTransfer.py, 1.1, 1.2 FileDownloader.py, 1.19, 1.20 Commands.py, 1.4, 1.5

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	URLopener.py FileUploader.py FileTransfer.py FileDownloader.py 
	Commands.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: URLopener.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/URLopener.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- URLopener.py	28 Apr 2006 03:17:40 -0000	1.2
+++ URLopener.py	9 May 2006 02:53:03 -0000	1.3
@@ -26,6 +26,7 @@
 import stat
 import httplib
 import shutil
+import socket
 
 def get_content_type(filename):
     return mimetypes.guess_type(filename)[0] or 'application/octet-stream'


Index: FileUploader.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/FileUploader.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileUploader.py	8 May 2006 14:24:30 -0000	1.2
+++ FileUploader.py	9 May 2006 02:53:03 -0000	1.3
@@ -28,8 +28,9 @@
 
 class FileUploader(FileTransfer.FileTransfer):
     def __init__(self, url, files, filevar, cgi_vars=None, certs=None):
-        FileTransfer.FileTransfer.__init__(self, url, certs)
+        FileTransfer.FileTransfer.__init__(self, certs)
         self._files = {}
+        self._url = url
 
         if files and type(files) == type(""):
             files = [files]


Index: FileTransfer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/FileTransfer.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileTransfer.py	8 May 2006 14:24:30 -0000	1.1
+++ FileTransfer.py	9 May 2006 02:53:03 -0000	1.2
@@ -26,20 +26,17 @@
 
 
 class FileTransfer(threading.Thread):
-    def __init__(self, url, certs=None):
+    def __init__(self, certs=None):
         self._callback = None
         self._cb_data = None
         self._cancel = False
         self._tries = 5
         self._opener = None
-        if not url:
-            raise Exception("Require a URL to download.")
-        self._url = url
 
         if certs:
             if type(certs) is not type({}):
                 raise ValueError("Certs must be a dict of certificate paths.")
-            self._certs = certs
+        self._certs = certs
 
         self._opener = URLopener.PlgURLopener(self._certs, 20)
 


Index: FileDownloader.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- FileDownloader.py	8 May 2006 14:24:30 -0000	1.19
+++ FileDownloader.py	9 May 2006 02:53:03 -0000	1.20
@@ -76,12 +76,13 @@
 
 class FileDownloader(FileTransfer.FileTransfer):
     def __init__(self, urls, target_dir, legal_exts, certs=None):
-        FileTransfer.FileTransfer.__init__(self, url, certs)
+        FileTransfer.FileTransfer.__init__(self, certs)
 
         if not target_dir:
             raise Exception("Require a target directory to download to.")
         self._target_dir = target_dir
 
+        self._files = {}
         if type(urls) == type(""):
             urls = [urls]
         if type(urls) is not type([]):
@@ -92,6 +93,9 @@
                 raise FileNameException("Bad file name from url %s" % url)
             self._files[url] = fname
 
+        if len(self._files.keys()) == 0:
+            raise ValueError("Need at least one file to download.")
+
     def _action(self, (url, fname)):
         result = None
         err_msg = None


Index: Commands.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/Commands.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Commands.py	8 May 2006 14:26:34 -0000	1.4
+++ Commands.py	9 May 2006 02:53:03 -0000	1.5
@@ -73,7 +73,8 @@
     cmds = []
     for item in cmd_stream:
         cmd = PlgCommand.deserialize(item)
-        cmds.append(cmd)
+        if cmd:
+            cmds.append(cmd)
     return cmds
 
 
@@ -135,6 +136,8 @@
             cmd = PlgCommandJobFiles._deserialize(args)
         elif name == CMD_NAME_JOB_FILES_ACK:
             cmd = PlgCommandJobFilesAck._deserialize(args)
+        elif name == CMD_NAME_UNLOCK_REPO:
+            cmd = PlgCommandUnlockRepo._deserialize(args)
 
         # If command creation was successful, set the sequence
         # number from the command stream on the command.  We don't