svn commit: r1890322 - in /spamassassin/trunk: lib/Mail/SpamAssassin/GeoDB.pm t/all_modules.t

[gb...@apache.org]

Author: gbechis
Date: Sun May 30 08:49:17 2021
New Revision: 1890322

URL: http://svn.apache.org/viewvc?rev=1890322&view=rev
Log:
do not print backtrace if we cannot load an optional
module, re-enable now working test

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm
    spamassassin/trunk/t/all_modules.t

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm?rev=1890322&r1=1890321&r2=1890322&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm Sun May 30 08:49:17 2021
@@ -214,7 +214,7 @@ sub load_geoip2 {
   eval {
     require MaxMind::DB::Reader;
   } or do {
-    dbg("geodb: MaxMind::DB::Reader (GeoIP2) module load failed: $@");
+    dbg("geodb: MaxMind::DB::Reader (GeoIP2) module load failed");
     return (undef, undef);
   };
 
@@ -257,7 +257,7 @@ sub load_geoip2 {
       };
       if ($@ || !$db->{$dbtype}) {
         $@ =~ s/\s+Trace begun.*//s;
-        dbg("geodb: GeoIP2: $dbtype load failed: $@");
+        dbg("geodb: GeoIP2: $dbtype load failed");
       } else {
         dbg("geodb: GeoIP2: loaded $dbtype from $path{$dbtype}");
         $ok = 1;
@@ -404,7 +404,7 @@ sub load_geoip {
     $can_ipv6 = Geo::IP->VERSION >= 1.39 && Geo::IP->api eq 'CAPI';
     1;
   } or do {
-    dbg("geodb: Geo::IP module load failed: $@");
+    dbg("geodb: Geo::IP module load failed");
     return (undef, undef);
   };
 

Modified: spamassassin/trunk/t/all_modules.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/all_modules.t?rev=1890322&r1=1890321&r2=1890322&view=diff
==============================================================================
--- spamassassin/trunk/t/all_modules.t (original)
+++ spamassassin/trunk/t/all_modules.t Sun May 30 08:49:17 2021
@@ -4,7 +4,7 @@ use lib '.'; use lib 't';
 use SATest; sa_t_init("all_modules");
 
 use Test::More;
-plan tests => 6;
+plan tests => 7;
 
 # ---------------------------------------------------------------------------
 
@@ -81,6 +81,7 @@ tstprefs("
         q{ Use of uninitialized }, 'uninitialized',
         q{ warn: }, 'warn',
         q{ SpamAssassin failed to parse line }, 'parse',
+        '/ at .* line \d+/', 'warn',
             );
 
 if (conf_bool('run_net_tests')) {