[minion-cvs] Minor patches

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ClientMain.py Packet.py 
Log Message:
Minor patches

Index: ClientMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientMain.py,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- ClientMain.py	23 May 2003 22:49:29 -0000	1.75
+++ ClientMain.py	25 May 2003 17:07:30 -0000	1.76
@@ -18,6 +18,7 @@
 import os
 import re
 import signal
+import socket
 import stat
 import string
 import sys
@@ -152,6 +153,7 @@
         def sigalrmHandler(sig, _):
             pass
         signal.signal(signal.SIGALRM, sigalrmHandler)
+        signal.alarm(DIRECTORY_TIMEOUT)
         try:
             try:
                 infile = urllib2.urlopen(url)

Index: Packet.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Packet.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- Packet.py	21 May 2003 18:03:33 -0000	1.42
+++ Packet.py	25 May 2003 17:07:31 -0000	1.43
@@ -612,7 +612,7 @@
         elif d['Message-type'] == 'encrypted':
             msgType = "ENC"
         else:
-            raise ParseError("Unknown message type: %r"%m.group(2))
+            raise ParseError("Unknown message type: %r"%d["Message-type"])
 
         ascTag = d.get("Decoding-handle")
         if ascTag: