[Spambayes-checkins] spambayes/spambayes Options.py,1.120,1.121

[Tony Meyer]

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

Modified Files:
	Options.py 
Log Message:
Fix bug idenfified by Manuel Hewitt.

If we are reloading the options, optionsPathname will already be set, so if we are
 a windows user using the default pathname, the object won't be reloaded.  Fix so
 a reload is always done.

Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Options.py,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** Options.py	3 Jan 2005 06:51:43 -0000	1.120
--- Options.py	4 Jan 2005 03:04:01 -0000	1.121
***************
*** 1176,1179 ****
--- 1176,1183 ----
      options.load_defaults(defaults)
  
+     # Maybe we are reloading.
+     if optionsPathname:
+         options.merge_file(optionsPathname)
+ 
      alternate = None
      if hasattr(os, 'getenv'):