[minion-cvs] Prevent the -R option to send from conflicting with the...

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ClientMain.py 
Log Message:
Prevent the -R option to send from conflicting with the -R option to list-servers

Index: ClientMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientMain.py,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- ClientMain.py	15 Dec 2003 19:20:36 -0000	1.139
+++ ClientMain.py	15 Dec 2003 22:44:56 -0000	1.140
@@ -717,7 +717,7 @@
     def __init__(self, opts,
                  wantConfig=0, wantClientDirectory=0, wantClient=0, wantLog=0,
                  wantDownload=0, wantForwardPath=0, wantReplyPath=0,
-                 minHops=0):
+                 minHops=0, ignoreOptions=[]):
         """Parse the command line options 'opts' as returned by getopt.getopt.
 
            wantConfig -- If true, accept options pertaining to the config file,
@@ -770,6 +770,7 @@
         self.forceNoQueue = None
 
         for o,v in opts:
+            if o in ignoreOptions: continue
             if o in ('-h', '--help'):
                 raise UsageError()
             elif o in ('-f', '--config'):
@@ -1294,7 +1295,8 @@
     try:
         parser = CLIArgumentParser(options, wantConfig=1,
                                    wantClientDirectory=1,
-                                   wantLog=1, wantDownload=1)
+                                   wantLog=1, wantDownload=1,
+                                   ignoreOptions=['-R'])
     except UsageError, e:
         e.dump()
         print _LIST_SERVERS_USAGE % {'cmd' : cmd}