[minion-cvs] Patch from tainaron: Fix crash when directory download ...

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria:/tmp/cvs-serv23100/lib/mixminion

Modified Files:
	ClientDirectory.py 
Log Message:
Patch from tainaron: Fix crash when directory download gives HTTPException.

Index: ClientDirectory.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientDirectory.py,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- ClientDirectory.py	2 Nov 2007 03:41:08 -0000	1.53
+++ ClientDirectory.py	31 Dec 2007 19:38:08 -0000	1.54
@@ -24,6 +24,8 @@
 import rfc822
 import urllib2
 
+from httplib import HTTPException
+
 import mixminion.Config
 import mixminion.Crypto
 import mixminion.NetUtils
@@ -481,6 +483,9 @@
                 else:
                     raise DirectoryDownloadError(
                         "Error connecting to directory server: %s"%e)
+            except HTTPException, e:
+                raise DirectoryDownloadError(
+                    "HTTP exception downloading directory: %s"%e)
         finally:
             if self.timeout:
                 mixminion.NetUtils.unsetGlobalTimeout()