extras-buildsys/common FileDownloader.py,1.15.2.1,1.15.2.2

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
      Tag: STABLE_0_4
	FileDownloader.py 
Log Message:
2006-03-20  Dan Williams  <dcbw at redhat.com>

    * common/FileDownloader.py
        - Pass error message to download callback

    * builder/builder.py
      server/ArchJob.py
        - Print out download errors, if any




Index: FileDownloader.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -r1.15.2.1 -r1.15.2.2
--- FileDownloader.py	18 Nov 2005 15:13:15 -0000	1.15.2.1
+++ FileDownloader.py	20 Mar 2006 12:48:44 -0000	1.15.2.2
@@ -94,6 +94,7 @@
 
     def run(self):
         result = None
+        err_msg = None
         if self._url and self._target_dir and self._filename:
             if not os.path.exists(self._target_dir):
                 os.makedirs(self._target_dir)
@@ -105,16 +106,16 @@
 #                if CommonErrors.canIgnoreSSLError(e):
 #                    pass
             except socket.error, e:
-                if CommonErrors.canIgnoreSocketError(e):
-                    pass
+                if not CommonErrors.canIgnoreSocketError(e):
+                    err_msg = "Socket Error: %s" % e
             except IOError, e:
-                if CommonErrors.canIgnoreSocketError(e):
-                    pass
+                if not CommonErrors.canIgnoreSocketError(e):
+                    err_msg = "IOError Error: %s" % e
 
         if result:
-            self._callback('done', self._cb_data)
+            self._callback('done', self._cb_data, err_msg)
         else:
-            self._callback('failed', self._cb_data)
+            self._callback('failed', self._cb_data, err_msg)