svn commit: r1864889 - in /spamassassin/trunk: lib/Mail/SpamAssassin/Util.pm t/idn_dots.t

[he...@apache.org]

Author: hege
Date: Sat Aug 10 16:34:39 2019
New Revision: 1864889

URL: http://svn.apache.org/viewvc?rev=1864889&view=rev
Log:
Handle missing Net::LibIDN better

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
    spamassassin/trunk/t/idn_dots.t

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=1864889&r1=1864888&r2=1864889&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Sat Aug 10 16:34:39 2019
@@ -125,8 +125,8 @@ BEGIN {
   eval { require Net::LibIDN } and do { $have_libidn = 1 };
 }
 
-#$have_libidn or warn "INFO: module Net::LibIDN not available,\n".
-#  "  internationalized domain names with U-labels will not be recognized!\n";
+$have_libidn or info("util: module Net::LibIDN not available, ".
+  "internationalized domain names with U-labels will not be recognized!");
 
 ###########################################################################
 

Modified: spamassassin/trunk/t/idn_dots.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/idn_dots.t?rev=1864889&r1=1864888&r2=1864889&view=diff
==============================================================================
--- spamassassin/trunk/t/idn_dots.t (original)
+++ spamassassin/trunk/t/idn_dots.t Sat Aug 10 16:34:39 2019
@@ -20,10 +20,14 @@ if (-e 'test_dir') {            # runnin
 use strict;
 use lib '.'; use lib 't';
 use SATest; sa_t_init("idn_dots.t");
-use Test::More tests => 6;
+use Test::More;
 use Mail::SpamAssassin;
 use vars qw(%patterns %anti_patterns);
 
+use constant HAS_LIBIDN => eval { require Net::LibIDN };
+plan skip_all => "module Net::LibIDN not available, internationalized domain names with U-labels will not be recognized!" unless HAS_LIBIDN;
+plan tests => 6;
+
 # initialize SpamAssassin
 my $sa = create_saobj({dont_copy_prefs => 1});
 $sa->init(0); # parse rules