[minion-cvs] Backport fix for bug 37 to the maint branch

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion/server
In directory moria.mit.edu:/tmp/cvs-serv7862/lib/mixminion/server

Modified Files:
      Tag: mixminion-v0-0-7-patches
	ServerMain.py 
Log Message:
Backport fix for bug 37 to the maint branch

Index: ServerMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerMain.py,v
retrieving revision 1.124
retrieving revision 1.124.2.1
diff -u -d -r1.124 -r1.124.2.1
--- ServerMain.py	23 Mar 2004 05:15:17 -0000	1.124
+++ ServerMain.py	26 Apr 2004 16:57:18 -0000	1.124.2.1
@@ -730,6 +730,9 @@
         except mixminion.ClientDirectory.GotInvalidDirectoryError, e:
             LOG.warn(str(e))
             LOG.warn("   (I'll use the old one until I get one that's good.)")
+        except UIError, e:#XXXX008 This should really be a new exception
+            LOG.warn(str(e))
+            LOG.warn("   (I'll use the old one until a download succeeds.)")
 
         self.dirClient._installAsKeyIDResolver()
 
@@ -843,6 +846,11 @@
                 LOG.warn("    I'll try again in an hour.")
                 nextUpdate = min(succeedingMidnight(time.time()+30),
                                  time.time()+3600)
+            except UIError, e:#XXXX008 This should really be a new exception
+                LOG.warn(str(e))
+                LOG.warn("    I'll try again in an hour.")
+                nextUpdate = min(succeedingMidnight(time.time()+30),
+                                 time.time()+3600)
             self.scheduleOnce(nextUpdate, "UPDATE_DIR_CLIENT",
                               self.updateDirectoryClient)
         self.processingThread.addJob(c)