[Spambayes-checkins] spambayes/scripts sb_server.py,1.21,1.21.4.1

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18091/scripts

Modified Files:
      Tag: release_1_0-branch
	sb_server.py 
Log Message:
Backport fix for sb_server command line options not working correctly.

Index: sb_server.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_server.py,v
retrieving revision 1.21
retrieving revision 1.21.4.1
diff -C2 -d -r1.21 -r1.21.4.1
*** sb_server.py	16 Mar 2004 05:08:31 -0000	1.21
--- sb_server.py	15 Oct 2004 05:48:17 -0000	1.21.4.1
***************
*** 640,643 ****
--- 640,651 ----
          self.init()
  
+         # Load up the other settings from Option.py / bayescustomize.ini
+         self.uiPort = options["html_ui", "port"]
+         self.launchUI = options["html_ui", "launch_browser"]
+         self.gzipCache = options["Storage", "cache_use_gzip"]
+         self.cacheExpiryDays = options["Storage", "cache_expiry_days"]
+         self.runTestServer = False
+         self.isTest = False
+ 
      def init(self):
          assert not self.prepared, "init after prepare, but before close"
***************
*** 664,674 ****
              sys.exit()
  
!         # Load up the other settings from Option.py / bayescustomize.ini
!         self.uiPort = options["html_ui", "port"]
!         self.launchUI = options["html_ui", "launch_browser"]
!         self.gzipCache = options["Storage", "cache_use_gzip"]
!         self.cacheExpiryDays = options["Storage", "cache_expiry_days"]
!         self.runTestServer = False
!         self.isTest = False
  
          # Set up the statistics.
--- 672,682 ----
              sys.exit()
  
! 
! 
! 
! 
! 
! 
! 
  
          # Set up the statistics.
***************
*** 910,914 ****
      # Read the arguments.
      try:
!         opts, args = getopt.getopt(sys.argv[1:], 'hbpsd:p:l:u:o:')
      except getopt.error, msg:
          print >>sys.stderr, str(msg) + '\n\n' + __doc__
--- 918,922 ----
      # Read the arguments.
      try:
!         opts, args = getopt.getopt(sys.argv[1:], 'hbd:p:l:u:o:')
      except getopt.error, msg:
          print >>sys.stderr, str(msg) + '\n\n' + __doc__