[minion-cvs] Revert to previous directory location

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ClientMain.py 
Log Message:
Revert to previous directory location

Index: ClientMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientMain.py,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- ClientMain.py	30 May 2003 00:01:57 -0000	1.83
+++ ClientMain.py	30 May 2003 02:07:41 -0000	1.84
@@ -44,10 +44,8 @@
      MBOX_TYPE, SMTP_TYPE, DROP_TYPE
 
 # FFFF This should be made configurable and adjustable.
-MIXMINION_DIRECTORY_URL = "http://mixminion.net/directory/Directory_TEST.gz";
-#MIXMINION_DIRECTORY_FINGERPRINT = "CD80DD1B8BE7CA2E13C928D57499992D56579CCD"
-# XXXX004 This change is temporary
-MIXMINION_DIRECTORY_FINGERPRINT = "67BE06E7C2ADCCE3F389675F8796EAF681B9875F"
+MIXMINION_DIRECTORY_URL = "http://mixminion.net/directory/Directory.gz";
+MIXMINION_DIRECTORY_FINGERPRINT = "CD80DD1B8BE7CA2E13C928D57499992D56579CCD"
 
 #----------------------------------------------------------------------
 # Global variable; holds an instance of Common.Lockfile used to prevent
@@ -2083,7 +2081,7 @@
       %(cmd)s -D no -t user@domain -i data
 """.strip()
 
-def usageAndExit(cmd, error=None):
+def sendUsageAndExit(cmd, error=None):
     if error:
         print >>sys.stderr, "ERROR: %s"%error
         print >>sys.stderr, "For usage, run 'mixminion send --help'"
@@ -2098,8 +2096,6 @@
   --no-queue                 Do not attempt to pool the message.""" }
     sys.exit(0)
 
-# NOTE: This isn't the final client interface.  Many or all options will
-#     change between now and 1.0.0
 def runClient(cmd, args):
     #DOCDOC Comment this function
     queueMode = 0
@@ -2116,7 +2112,7 @@
               "input=", "pool", "no-pool", "queue", "no-queue" ])
 
     if not options:
-        usageAndExit(cmd)
+        sendUsageAndExit(cmd)
 
     inFile = None
     for opt,val in options:
@@ -2124,7 +2120,7 @@
             inFile = val
 
     if args:
-        usageAndExit(cmd,"Unexpected arguments")
+        sendUsageAndExit(cmd,"Unexpected arguments")
 
     try:
         parser = CLIArgumentParser(options, wantConfig=1,wantClientDirectory=1,
@@ -2136,7 +2132,7 @@
             raise UsageError("Can't use both --queue and --no-queue")
     except UsageError, e:
         e.dump()
-        usageAndExit(cmd)
+        sendUsageAndExit(cmd)
 
     if inFile in (None, '-') and '-' in parser.replyBlockFiles:
         raise UIError(
@@ -2219,7 +2215,6 @@
 
     if len(args) == 0:
         raise UsageError("(No servers provided)")
-
 
     print "==========================================================="
     print "WARNING: Pinging a server is potentially dangerous, since"