You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2010/03/31 13:12:20 UTC
svn commit: r929478 - in /spamassassin/branches/3.3/lib/Mail:
SpamAssassin.pm SpamAssassin/BayesStore/DBM.pm
Author: jm
Date: Wed Mar 31 11:12:20 2010
New Revision: 929478
URL: http://svn.apache.org/viewvc?rev=929478&view=rev
Log:
bug 6393: make File::Copy module load conditional on 'sa-learn --upgrade' with DBM files, not very commonly used
Modified:
spamassassin/branches/3.3/lib/Mail/SpamAssassin.pm
spamassassin/branches/3.3/lib/Mail/SpamAssassin/BayesStore/DBM.pm
Modified: spamassassin/branches/3.3/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.3/lib/Mail/SpamAssassin.pm?rev=929478&r1=929477&r2=929478&view=diff
==============================================================================
--- spamassassin/branches/3.3/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/branches/3.3/lib/Mail/SpamAssassin.pm Wed Mar 31 11:12:20 2010
@@ -82,7 +82,6 @@ use Errno qw(ENOENT EACCES);
use File::Basename;
use File::Path;
use File::Spec 0.8;
-use File::Copy;
use Time::HiRes qw(time);
use Cwd;
use Config;
Modified: spamassassin/branches/3.3/lib/Mail/SpamAssassin/BayesStore/DBM.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.3/lib/Mail/SpamAssassin/BayesStore/DBM.pm?rev=929478&r1=929477&r2=929478&view=diff
==============================================================================
--- spamassassin/branches/3.3/lib/Mail/SpamAssassin/BayesStore/DBM.pm (original)
+++ spamassassin/branches/3.3/lib/Mail/SpamAssassin/BayesStore/DBM.pm Wed Mar 31 11:12:20 2010
@@ -1433,7 +1433,6 @@ sub perform_upgrade {
local $SIG{'__DIE__'}; # do not run user die() traps in here
use File::Basename;
- use File::Copy;
# bayes directory
my $main = $self->{bayes}->{main};
@@ -1457,7 +1456,10 @@ sub perform_upgrade {
for (@files) {
my $src = "$dir/$_";
my $dst = "$dir/old_$_";
- copy($src, $dst) || die "bayes: can't copy $src to $dst: $!\n";
+ eval q{
+ use File::Copy;
+ copy($src, $dst);
+ } || die "bayes: can't copy $src to $dst: $!\n";
}
# delete previous to make way for import