From 93967b60be3689605a20fbc7662cf744b23ab844 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Fri, 31 May 2024 13:11:36 -0700 Subject: [PATCH] find_psl_file: fix duplicate share in path (#232) - remove t/travis/.travis.yml CI config file, partial fix for #231 --- lib/Mail/DMARC/Base.pm | 13 ++++++------- t/travis/.travis.yml | 12 ------------ 2 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 t/travis/.travis.yml diff --git a/lib/Mail/DMARC/Base.pm b/lib/Mail/DMARC/Base.pm index f437aed4..e4cf82d6 100644 --- a/lib/Mail/DMARC/Base.pm +++ b/lib/Mail/DMARC/Base.pm @@ -194,14 +194,13 @@ sub find_psl_file { print "using $file for Public Suffix List\n" if $self->verbose; return $file; } - my $path; - foreach $path ($self->get_prefix('share/' . $file)) { ## no critic - last if ( -f $path && -r $path ); + + foreach my $path ($self->get_prefix($file)) { + if ( -f $path && -r $path ) { + print "using $path for Public Suffix List\n"; # if $self->verbose; + return $path; + } } - if ($path && -r $path) { - print "using $path for Public Suffix List\n" if $self->verbose; - return $path; - }; # Fallback to included suffic list return $self->get_sharefile('public_suffix_list'); diff --git a/t/travis/.travis.yml b/t/travis/.travis.yml deleted file mode 100644 index 7b4e2d73..00000000 --- a/t/travis/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -language: perl -perl: - - "5.18" - - "5.12" - - "5.10" - -before_install: - # Prevent "Please tell me who you are" errors for certain DZIL configs - - git config --global user.name "TravisCI" - - # install optional DBD::SQLite, so more tests can run - - cpanm --quiet --notest --skip-satisfied DBD::SQLite