extras-buildsys/server ArchJob.py,1.26,1.27

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	ArchJob.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: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ArchJob.py	23 Feb 2006 19:13:48 -0000	1.26
+++ ArchJob.py	20 Mar 2006 12:47:01 -0000	1.27
@@ -215,7 +215,7 @@
                     dl_dict[DL_WAIT_TIME] = 0
                     self._downloads[uf] = dl_dict
 
-    def dl_callback(self, status, cb_data):
+    def dl_callback(self, status, cb_data, err_msg):
         url = cb_data
         self._download_lock.acquire()
         dl_dict = self._downloads[url]
@@ -226,8 +226,8 @@
             if dl_dict[DL_RETRIES] >= 10:
                 dl_dict[DL_STATUS] = STATUS_ERROR
             else:
-                print "%s (%s/%s): Failed to retrieve %s (attempt %d), trying again..." % (self.par_job.uid,
-                        self.par_job.package, self._target_dict['arch'], url, dl_dict[DL_RETRIES])
+                print "%s (%s/%s): Failed to retrieve %s (attempt %d) (Error %s), trying again..." % (self.par_job.uid,
+                        self.par_job.package, self._target_dict['arch'], url, dl_dict[DL_RETRIES], err_msg)
                 dl_dict[DL_STATUS] = STATUS_WAITING
                 dl_dict[DL_WAIT_TIME] = 5  # Wait a bit before trying again
                 dl_dict[DL_RETRIES] = dl_dict[DL_RETRIES] + 1