extras-buildsys/server ArchJob.py,1.5,1.6

[Daniel Williams (dcbw)]

Author: dcbw

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

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

    * builder/builder.py
      common/FileDownloader.py
      server/ArchJob.py
        - Allow '+' character in RPM names
        - Clean up file name handling in URLs




Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ArchJob.py	11 Jul 2005 00:30:36 -0000	1.5
+++ ArchJob.py	18 Jul 2005 17:24:39 -0000	1.6
@@ -221,9 +221,15 @@
         """ Return a list of base filenames we got from the builder """
         files = []
         for url in self.downloads.keys():
-            fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log'])
-            if fname and self.downloads[url] == 3:
-                files.append(fname)
+            try:
+                fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log'])
+                if self.downloads[url] == 3:
+                    files.append(fname)
+            except FileDownloader.FileNameError, e:
+                # Just ignore the file then
+                print "%s (%s/%s): Illegal file name.  Error: '%s', URL: %s" % (self.par_job.uid,
+                        self.par_job.package, self.arch, e, url)
+                pass
         return files
 
     def set_download_status(self, url, status):