[Spambayes-checkins] spambayes/scripts sb_server.py,1.44,1.45

[Tony Meyer]

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

Modified Files:
	sb_server.py 
Log Message:
Specifying a server on the command line didn't work either, so fix that.  If one is
 specified, it is the *only* server that is run (i.e. any in the options are ignored).

Index: sb_server.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_server.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** sb_server.py	6 Apr 2005 04:06:36 -0000	1.44
--- sb_server.py	6 Apr 2005 04:13:41 -0000	1.45
***************
*** 740,752 ****
              self.logFile = open('_pop3proxy.log', 'wb', 0)
  
!         self.servers = []
!         if options["pop3proxy", "remote_servers"]:
!             for server in options["pop3proxy", "remote_servers"]:
!                 server = server.strip()
!                 if server.find(':') > -1:
!                     server, port = server.split(':', 1)
!                 else:
!                     port = '110'
!                 self.servers.append((server, int(port)))
  
          if not hasattr(self, "proxyPorts"):
--- 740,754 ----
              self.logFile = open('_pop3proxy.log', 'wb', 0)
  
!         if not hasattr(self, "servers"):
!             # Could have already been set via the command line.
!             self.servers = []
!             if options["pop3proxy", "remote_servers"]:
!                 for server in options["pop3proxy", "remote_servers"]:
!                     server = server.strip()
!                     if server.find(':') > -1:
!                         server, port = server.split(':', 1)
!                     else:
!                         port = '110'
!                     self.servers.append((server, int(port)))
  
          if not hasattr(self, "proxyPorts"):