[Spambayes-checkins] spambayes pop3proxy.py,1.44,1.45

[Tim Stone]

Update of /cvsroot/spambayes/spambayes
In directory sc8-pr-cvs1:/tmp/cvs-serv21811

Modified Files:
	pop3proxy.py 
Log Message:
Changed -d and -p arguments to match hammie arguments of -d DBMfilename
and -D PICKLEfilename.  -p argument is no longer valid

Index: pop3proxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pop3proxy.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** pop3proxy.py	25 Jan 2003 12:55:58 -0000	1.44
--- pop3proxy.py	27 Jan 2003 18:07:11 -0000	1.45
***************
*** 17,22 ****
              -h      : Displays this help message.
  
!             -p FILE : use the named database file
!             -d      : the database is a DBM file rather than a pickle
              -l port : proxy listens on this port number (default 110)
              -u port : User interface listens on this port number
--- 17,22 ----
              -h      : Displays this help message.
  
!             -d FILE : use the named DBM database file
!             -D FILE : the the named Pickle database file
              -l port : proxy listens on this port number (default 110)
              -u port : User interface listens on this port number
***************
*** 1501,1505 ****
      # Read the arguments.
      try:
!         opts, args = getopt.getopt(sys.argv[1:], 'htdbzp:l:u:')
      except getopt.error, msg:
          print >>sys.stderr, str(msg) + '\n\n' + __doc__
--- 1501,1505 ----
      # Read the arguments.
      try:
!         opts, args = getopt.getopt(sys.argv[1:], 'htbzpd:D:l:u:')
      except getopt.error, msg:
          print >>sys.stderr, str(msg) + '\n\n' + __doc__
***************
*** 1516,1523 ****
          elif opt == '-b':
              state.launchUI = True
!         elif opt == '-d':
              state.useDB = True
-         elif opt == '-p':
              options.pop3proxy_persistent_storage_file = arg
          elif opt == '-l':
              state.proxyPorts = [_addressAndPort(arg)]
--- 1516,1529 ----
          elif opt == '-b':
              state.launchUI = True
!         elif opt == '-d':   // dbm file
              state.useDB = True
              options.pop3proxy_persistent_storage_file = arg
+         elif opt == '-D':   // pickle file
+             state.useDB = False
+             options.pop3proxy_persistent_storage_file = arg
+         elif opt == '-p':   // dead option
+             print >>sys.stderr, "-p option is no longer supported, use -D\n"
+             print >>sys.stderr, __doc__
+             sys.exit()
          elif opt == '-l':
              state.proxyPorts = [_addressAndPort(arg)]