extras-buildsys/common FileDownloader.py, 1.15.2.1.4.1, 1.15.2.1.4.2 SSLCommon.py, 1.10.4.3, 1.10.4.3.4.1

[Michael Schwendt]

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23617/common

Modified Files:
      Tag: Plague-0_4_5
	FileDownloader.py SSLCommon.py 
Log Message:
Fix file downloading for Python 2.6.



Index: FileDownloader.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v
retrieving revision 1.15.2.1.4.1
retrieving revision 1.15.2.1.4.2
diff -u -r1.15.2.1.4.1 -r1.15.2.1.4.2
--- FileDownloader.py	31 Jan 2008 14:19:43 -0000	1.15.2.1.4.1
+++ FileDownloader.py	16 Dec 2008 22:35:25 -0000	1.15.2.1.4.2
@@ -149,8 +149,8 @@
         return len(self.lst)
 
 
-def dl_callback(status, dlwr):
-    print "Finished with %d (%s)" % (dlwr.num, status)
+def dl_callback(status, dlwr, msg):
+    print "Finished with %d (%s): %s" % (dlwr.num, status, msg)
     dlwr.tracker.remove(dlwr)
 
 


Index: SSLCommon.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/SSLCommon.py,v
retrieving revision 1.10.4.3
retrieving revision 1.10.4.3.4.1
diff -u -r1.10.4.3 -r1.10.4.3.4.1
--- SSLCommon.py	12 Mar 2006 05:52:59 -0000	1.10.4.3
+++ SSLCommon.py	16 Dec 2008 22:35:25 -0000	1.10.4.3.4.1
@@ -20,6 +20,7 @@
 import SSLConnection
 import httplib
 import socket
+import select, errno
 import SocketServer
 
 def our_verify(connection, x509, errNum, errDepth, preverifyOK):
@@ -65,7 +66,13 @@
 
     def serve_forever(self):
         while not self._quit:
-            self.handle_request()
+            try:
+                self.handle_request()
+            except select.error, (err, strerr):
+                if err == errno.EINTR:
+                   continue
+                else:
+                    raise
         self.server_close()