[minion-cvs] Change -H handling: translate -H n into -P *n; make -H ...

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ClientMain.py 
Log Message:
Change -H handling: translate -H n into -P *n; make -H and -P mutually exclusive

Index: ClientMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientMain.py,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- ClientMain.py	15 Dec 2003 22:44:56 -0000	1.140
+++ ClientMain.py	18 Dec 2003 23:03:01 -0000	1.141
@@ -832,10 +832,9 @@
                 self.forceNoQueue = 1
 
         if self.nHops and not self.path:
-            LOG.warn("-H/--hops is deprecated; use -P '*%d' instead",
-                     self.nHops)
+            self.path = '*%d'% self.nHops
         elif self.nHops:
-            LOG.warn("-H/--hops is deprecated")
+            raise UIError("You cannot specify both a path (-P/--path) and a number of hops (-H/--hops)")
 
     def init(self):
         """Configure objects and initialize subsystems as specified by the
@@ -955,7 +954,7 @@
 
         self.pathSpec = mixminion.ClientDirectory.parsePath(
             self.config, self.path, self.nHops, isReply=isReply, isSURB=isSURB,
-            defaultNHops = defHops)
+            defaultNHops=defHops)
         self.directory.validatePath(self.pathSpec, self.exitAddress,
                                     self.startAt, self.endAt)