[minion-cvs] bug 35) Stop appending message headers when delivering ...

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ClientMain.py 
Log Message:
(bug 35) Stop appending message headers when delivering with --deliver-fragments

Index: ClientMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientMain.py,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- ClientMain.py	24 Mar 2004 20:39:56 -0000	1.174
+++ ClientMain.py	1 Apr 2004 04:18:34 -0000	1.175
@@ -1190,6 +1190,12 @@
                                       inReplyTo=h_irt, references=h_references)
     except MixError, e:
         raise UIError("Invalid headers: %s"%e)
+    if no_ss_fragments:
+        if headerStr != '\n':
+            raise UIError("Can't use --deliver-fragments with message headers")
+        else:
+            # suppress intial newline.
+            headerStr = ""
 
     if inFile == '-' and '-' in parser.replyBlockSources:
         raise UIError(
@@ -1203,6 +1209,8 @@
     client = parser.client
     parser.parsePath()
     address = parser.exitAddress
+    # Tell the address about the headers, so it knows to pick an exit
+    # that supports them.
     address.setHeaders(parseMessageAndHeaders(headerStr+"\n")[1])
 
     # Get our surb, if any.