[SACVS] CVS: spamassassin/lib/Mail SpamAssassin.pm,1.211,1.212

Update of /cvsroot/spamassassin/spamassassin/lib/Mail
In directory sc8-pr-cvs1:/tmp/cvs-serv8338/lib/Mail

Modified Files:
        SpamAssassin.pm 
Log Message:
bug 2491:
1) the learn_to_journal option was only good for autolearning and using
sa-learn, but "spamassassin -r" just went r/w all the time.

2) when running from spamassassin, caller_will_untie was false.
so when learn() called forget(), forget() would untie, thereby leaving
learn() screwed.  this was generating the undefined warnings since the
untie() cleared db_version.  so we kluge around that by saving/setting
caller_will_untie, then restoring after the forget().

3) forget() didn't know it could "learn to journal", so it always
went r/w.


Index: SpamAssassin.pm
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/lib/Mail/SpamAssassin.pm,v
retrieving revision 1.211
retrieving revision 1.212
diff -b -w -u -d -r1.211 -r1.212
--- SpamAssassin.pm     22 Sep 2003 19:32:14 -0000      1.211
+++ SpamAssassin.pm     23 Sep 2003 00:08:04 -0000      1.212
@@ -1214,9 +1214,7 @@
 
   $self->{conf}->set_score_set ($set);
 
-  if ($self->{conf}->{bayes_auto_learn}) {
     $self->init_learner({ 'learn_to_journal' => 
$self->{conf}->{bayes_learn_to_journal} });
-  }
 
   if ($self->{only_these_rules}) {
     $self->trim_rules($self->{only_these_rules});



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf