extras-buildsys/common FileDownloader.py, 1.2, 1.3 SimpleHTTPSServer.py, 1.1, 1.2

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	FileDownloader.py SimpleHTTPSServer.py 
Log Message:
2005-06-09  Dan Williams <dcbw at redhat.com>

    * client/buildclient.py
        - Add sparc32 and sparc64 bits

2005-06-09  Dan Williams <dcbw at redhat.com>

    * common/FileDownloader.py
        - Don't traceback on refused or dropped connections




Index: FileDownloader.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileDownloader.py	9 Jun 2005 01:57:40 -0000	1.2
+++ FileDownloader.py	10 Jun 2005 01:35:40 -0000	1.3
@@ -90,7 +90,12 @@
                 os.makedirs(self._target_dir)
             os.chdir(self._target_dir)
             target_file = os.path.join(self._target_dir, self._filename)
-            result = self._opener.retrieve(self._url, target_file)
+            try:
+                result = self._opener.retrieve(self._url, target_file)
+            except SSLError, e:
+                # Don't traceback on dropped connections or timeouts
+                if e[0] == 104 or e[0] == 111:
+                    result = None
             if result:
                 success = True
 


Index: SimpleHTTPSServer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/SimpleHTTPSServer.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleHTTPSServer.py	9 Jun 2005 01:57:40 -0000	1.1
+++ SimpleHTTPSServer.py	10 Jun 2005 01:35:40 -0000	1.2
@@ -123,3 +123,4 @@
 
     def run(self):
         self._server.serve_forever()
+