[Nym3-commit] r415 - trunk/nymbaron/Server

[laurent at conuropsis.org]

Author: laurent
Date: 2005-11-16 23:55:05 +0100 (Wed, 16 Nov 2005)
New Revision: 415

Modified:
   trunk/nymbaron/Server/Main.py
Log:
Fix bug: you can't use sys.stdin.read() twice...


Modified: trunk/nymbaron/Server/Main.py
===================================================================
--- trunk/nymbaron/Server/Main.py	2005-11-16 22:54:18 UTC (rev 414)
+++ trunk/nymbaron/Server/Main.py	2005-11-16 22:55:05 UTC (rev 415)
@@ -273,13 +273,14 @@
 	    processIncoming(a, sys.stdin.read())
 	    sys.exit(0)
 	if o == "-m":
+	    msg = sys.stdin.read()
 	    try:
-		processMessage(sys.stdin.read())
-	    except Message.ParseError:
+		processMessage(msg)
+	    except Exception:
 		# see if we got a base64 encoded message.
 		import base64
 		import re
-		m = re.search("binary\\n\\n(.*)\\n---", sys.stdin.read(), re.S)
+		m = re.search("binary\\n\\n(.*)\\n---", msg, re.S)
 		if m:
 		    processMessage(base64.decodestring(m.group(1)))
 		else: sys.stderr.write("Unable to find valid control message")