From bca002579dcaf59d30fdd8c3aea542ea0fea154f Mon Sep 17 00:00:00 2001 From: Jason Stephenson Date: Sat, 6 Jul 2019 10:33:44 -0400 Subject: [PATCH] Update require vs. use for Perl 5.26+ Switch from use to require for submodules in OpenILS::Application::Storage::CDBI and OpenILS::Application::Storage::Driver::Pg to eliminate the following errors in Perl 5.26 and higher: Compilation failed in require at /usr/local/share/perl/5.28.1/OpenILS/Application/Storage/CDBI.pm line 9. Compilation failed in require at /usr/local/share/perl/5.26.1/OpenILS/Application/Storage/Driver/Pg.pm line 15. Signed-off-by: Jason Stephenson --- .../lib/OpenILS/Application/Storage/CDBI.pm | 24 +++++++++++----------- .../lib/OpenILS/Application/Storage/Driver/Pg.pm | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI.pm index d164251ad6..0d1a158e00 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI.pm @@ -6,18 +6,18 @@ BEGIN { use base qw/Class::DBI/; use Class::DBI::AbstractSearch; -use OpenILS::Application::Storage::CDBI::actor; -use OpenILS::Application::Storage::CDBI::action; -use OpenILS::Application::Storage::CDBI::booking; -use OpenILS::Application::Storage::CDBI::asset; -use OpenILS::Application::Storage::CDBI::serial; -use OpenILS::Application::Storage::CDBI::authority; -use OpenILS::Application::Storage::CDBI::biblio; -use OpenILS::Application::Storage::CDBI::config; -use OpenILS::Application::Storage::CDBI::metabib; -use OpenILS::Application::Storage::CDBI::money; -use OpenILS::Application::Storage::CDBI::permission; -use OpenILS::Application::Storage::CDBI::container; +require OpenILS::Application::Storage::CDBI::actor; +require OpenILS::Application::Storage::CDBI::action; +require OpenILS::Application::Storage::CDBI::booking; +require OpenILS::Application::Storage::CDBI::asset; +require OpenILS::Application::Storage::CDBI::serial; +require OpenILS::Application::Storage::CDBI::authority; +require OpenILS::Application::Storage::CDBI::biblio; +require OpenILS::Application::Storage::CDBI::config; +require OpenILS::Application::Storage::CDBI::metabib; +require OpenILS::Application::Storage::CDBI::money; +require OpenILS::Application::Storage::CDBI::permission; +require OpenILS::Application::Storage::CDBI::container; use OpenSRF::Utils::JSON; use OpenSRF::Utils::Logger qw(:level); diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg.pm index 3a645953a4..f5115360cf 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg.pm @@ -10,10 +10,10 @@ # OpenILS::Application::Storage. #------------------------------------------------------------------------------- package OpenILS::Application::Storage::Driver::Pg; - use OpenILS::Application::Storage::Driver::Pg::cdbi; - use OpenILS::Application::Storage::Driver::Pg::fts; - use OpenILS::Application::Storage::Driver::Pg::storage; - use OpenILS::Application::Storage::Driver::Pg::dbi; + require OpenILS::Application::Storage::Driver::Pg::cdbi; + require OpenILS::Application::Storage::Driver::Pg::fts; + require OpenILS::Application::Storage::Driver::Pg::storage; + require OpenILS::Application::Storage::Driver::Pg::dbi; use UNIVERSAL::require; BEGIN { 'Class::DBI::Frozen::301'->use or 'Class::DBI'->use or die $@; -- 2.11.0