[minion-cvs] Rename foo-server to server-foo; retain old variants wi...

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ServerMain.py 
Log Message:
Rename foo-server to server-foo; retain old variants with a warning

Index: ServerMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerMain.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- ServerMain.py	14 Feb 2003 21:48:17 -0000	1.42
+++ ServerMain.py	19 Feb 2003 03:41:22 -0000	1.43
@@ -777,11 +777,17 @@
 
     LOG.setMinSeverity("ERROR")
     config = readConfigFile(configFile)
-    if cmd.endswith("stop-server"):
+    if cmd.endswith("stop-server") or cmd.endswith("server-stop"):
         reload = 0
     else:
-        assert cmd.endswith("reload-server")
+        assert cmd.endswith("reload-server") or cmd.endswith("server-reload")
         reload = 1
+
+    #XXXX004 remove this.
+    if cmd.endswith("stop-server"):
+        print "Obsolete command. Use 'mixminion server-stop' instead."
+    elif cmd.endswith("reload-server"):
+        print "Obsolete command. Use 'mixminion server-reload' instead."
 
     if usage:
         print _SIGNAL_SERVER_USAGE % { 'cmd' : cmd }