extras-buildsys/builder builder.py,1.18,1.19

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	builder.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: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- builder.py	16 Jul 2005 16:42:15 -0000	1.18
+++ builder.py	18 Jul 2005 17:24:28 -0000	1.19
@@ -93,11 +93,12 @@
    Architecture: %s
    SRPM: %s\n\n""" % (time.asctime(time.gmtime()), self._target, self._uniqid, self.buildarch, srpm_url))
 
-        srpm_filename = FileDownloader.get_base_filename_from_url(srpm_url, ['.src.rpm'])
-        if not srpm_filename:
+        try:
+            srpm_filename = FileDownloader.get_base_filename_from_url(srpm_url, ['.src.rpm'])
+        except FileDownloader.FileNameError, e:
             self._status = 'failed'
             self._srpm_path = None
-            self.log("Failed in __init__, couldn't extract SRPM filename.\n")
+            self.log("Failed to extract SRPM filename.  Error: '%s'   URL: %s\n" % (e, srpm_url))
         else:
             self._srpm_path = os.path.join(config_opts['builder_work_dir'], self._uniqid, "source", srpm_filename)