[minion-cvs] Fix bug with prematurely removing msgs from client queue

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ClientMain.py 
Log Message:
Fix bug with prematurely removing msgs from client queue

Index: ClientMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientMain.py,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- ClientMain.py	19 Oct 2003 03:12:01 -0000	1.122
+++ ClientMain.py	19 Oct 2003 03:41:45 -0000	1.123
@@ -417,7 +417,7 @@
                                                   timeout)
                 LOG.info("... %s sent", mword)
             except:
-                e = sys.exc_info()[1]
+                e = sys.exc_info()
                 if noQueue and warnIfLost:
                     LOG.error("Error with queueing disabled: %s lost", mword)
                 elif lazyQueue:
@@ -427,8 +427,8 @@
                 else:
                     LOG.info("Error while delivering %s; leaving in queue",
                              mword)
-
-                LOG.info("Error was: %s",e)
+                LOG.info("Error was: %s",e[1])
+                return
             try:
                 clientLock()
                 for h in handles:
@@ -472,6 +472,7 @@
             handles = [ h for _, h in messagesByServer[routing] ]
             try:
                 self.sendMessages(msgs, routing, noQueue=1, warnIfLost=0)
+                #XXXX006 is this part needed?
                 try:
                     clientLock()
                     for h in handles: