[Spambayes-checkins] spambayes/spambayes hammiebulk.py,1.6,1.7

[Tony Meyer]

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

Modified Files:
	hammiebulk.py 
Log Message:
When the (second) options changeover occured, certain options
were merged.  This resulted in the default for persisent_storage_file
changing.  I patched hammiefilter at the time to avoid problems with
this, but (dammit!) missed that I needed to patch hammiebulk as well.

This is that rather belated patch.

Index: hammiebulk.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/hammiebulk.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** hammiebulk.py	21 Jun 2003 04:46:32 -0000	1.6
--- hammiebulk.py	8 Jul 2003 00:08:53 -0000	1.7
***************
*** 61,64 ****
--- 61,70 ----
  # Default database name
  DEFAULTDB = os.path.expanduser(options.hammiefilter_persistent_storage_file)
+ # This is a bit of a hack to counter the default for
+ # persistent_storage_file changing from ~/.hammiedb to hammie.db
+ # This will work unless a user had hammie.db as their value for
+ # persistent_storage_file
+ if DEFAULTDB == options.default("Storage", "persistent_storage_file"):
+     DEFAULTDB = "~/.hammiedb"
  
  # Probability at which a message is considered spam