You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2009/08/18 10:55:10 UTC
svn commit: r805325 - in /spamassassin/trunk:
lib/Mail/SpamAssassin/Plugin/DKIM.pm t/dkim2.t
Author: mmartinec
Date: Tue Aug 18 08:55:10 2009
New Revision: 805325
URL: http://svn.apache.org/viewvc?rev=805325&view=rev
Log:
Let t/dkim2.t just quit in absence of Mail::DKIM::Verifier
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
spamassassin/trunk/t/dkim2.t
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm?rev=805325&r1=805324&r2=805325&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm Tue Aug 18 08:55:10 2009
@@ -502,13 +502,16 @@
{ require Mail::DKIM; require Mail::DKIM::Verifier;
require Mail::DKIM::DkimPolicy;
eval { require Mail::DKIM::AuthorDomainPolicy }; # since Mail::DKIM 0.34
- 1;
}
+ 1;
} or do {
$eval_stat = $@ ne '' ? $@ : "errno=$!"; chomp $eval_stat;
};
- if (!defined($eval_stat)) {
+ if (defined $eval_stat) {
+ dbg("dkim: cannot load Mail::DKIM module, DKIM checks disabled: %s",
+ $eval_stat);
+ } else {
my $version = Mail::DKIM::Verifier->VERSION;
if ($version >= 0.31) {
dbg("dkim: using Mail::DKIM version $version for DKIM checks");
@@ -517,8 +520,6 @@
"minimal version 0.31, suggested upgrade to 0.35 or later!\n");
}
$self->{tried_loading} = 1;
- } else {
- dbg("dkim: cannot load Mail::DKIM module, DKIM checks disabled: $eval_stat");
}
}
Modified: spamassassin/trunk/t/dkim2.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/dkim2.t?rev=805325&r1=805324&r2=805325&view=diff
==============================================================================
--- spamassassin/trunk/t/dkim2.t (original)
+++ spamassassin/trunk/t/dkim2.t Tue Aug 18 08:55:10 2009
@@ -41,7 +41,6 @@
}
use IO::File;
-use Mail::DKIM::Verifier;
use Mail::SpamAssassin;