extras-buildsys/builder builder.py,1.44.2.9,1.44.2.10

Daniel Williams (dcbw) fedora-extras-commits at redhat.com
Mon Mar 20 12:48:46 UTC 2006


Author: dcbw

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

Modified Files:
      Tag: STABLE_0_4
	builder.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: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.44.2.9
retrieving revision 1.44.2.10
diff -u -r1.44.2.9 -r1.44.2.10
--- builder.py	13 Mar 2006 15:17:49 -0000	1.44.2.9
+++ builder.py	20 Mar 2006 12:48:38 -0000	1.44.2.10
@@ -169,7 +169,7 @@
                 sys.stdout.write(s + string)
                 sys.stdout.flush()
 
-    def dl_callback(self, dl_status, cb_data):
+    def dl_callback(self, dl_status, cb_data, err_msg):
         url = cb_data
         if dl_status == 'done':
             self._status = 'downloaded'
@@ -187,7 +187,7 @@
             else:
                 # retry the download
                 self._status = 'init'
-                self._log("ERROR: Failed to retrieve %s on attempt %d.  Trying again...\n" % (url, self._srpm_tries))
+                self._log("ERROR: Failed to retrieve %s on attempt %d (%s).  Trying again...\n" % (url, self._srpm_tries, err_msg))
 
     def _copy_mock_output_to_log(self):
         if self._mock_log and os.path.exists(self._mock_log):




More information about the fedora-extras-commits mailing list