[minion-cvs] Fix command-line flush command (caught by qumqats)

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ClientMain.py Main.py 
Log Message:
Fix command-line flush command (caught by qumqats)

Index: ClientMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientMain.py,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- ClientMain.py	27 Mar 2003 15:34:37 -0000	1.69
+++ ClientMain.py	4 Apr 2003 20:28:55 -0000	1.70
@@ -2601,6 +2601,9 @@
         print _LIST_QUEUE_USAGE % { 'cmd' : cmd }
         sys.exit(1)
 
+    if cmd.endswith("pool"):
+        LOG.warn("'inspect-pool' is deprecated; use inspect-queue instead")
+
     parser.init()
     client = parser.client
 

Index: Main.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Main.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- Main.py	26 Mar 2003 16:36:46 -0000	1.37
+++ Main.py	4 Apr 2003 20:28:55 -0000	1.38
@@ -126,8 +126,10 @@
     "generate-surbs" : ( 'mixminion.ClientMain', 'generateSURB' ),
     "inspect-surb" :   ( 'mixminion.ClientMain', 'inspectSURBs' ),
     "inspect-surbs" :  ( 'mixminion.ClientMain', 'inspectSURBs' ),
-    "flush" :          ( 'mixminion.ClientMain', 'flushPool' ),
-    "inspect-pool" :   ( 'mixminion.ClientMain', 'listPool' ),
+    "flush" :          ( 'mixminion.ClientMain', 'flushQueue' ),
+    "inspect-queue" :   ( 'mixminion.ClientMain', 'listQueue' ),
+    # XXXX Obsolete; use "inspect-queue"; remove in 0.0.5
+    "inspect-pool" :   ( 'mixminion.ClientMain', 'listQueue' ),    
     # XXXX Obsolete; use "server-start"; remove in 0.0.5
     "server" :         ( 'mixminion.server.ServerMain', 'runServer' ),
     "server-start" :   ( 'mixminion.server.ServerMain', 'runServer' ),