From 5e6e17f3b6b977d66747d615c465403935459d1a Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 27 Jun 2016 15:56:58 +0000 Subject: [PATCH] Bug 16685 [QA Followup] - Use Path::Tiny::slurp instead of File::Slurp File::Slurp is considered better to use than File::Slurp. RM Note: The package version in wheezy is too old, the package version in jessie is just fine and should be added to the community repo if wheezy will be supported for the coming release. --- C4/Installer/PerlDependencies.pm | 5 +++++ installer/data/mysql/updatedatabase.pl | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm index 89df812..4831f21 100644 --- a/C4/Installer/PerlDependencies.pm +++ b/C4/Installer/PerlDependencies.pm @@ -807,6 +807,11 @@ our $PERL_DEPS = { required => 1, min_ver => '1.00', }, + 'Path::Tiny' => { + usage => 'Core', + required => 1, + min_ver => '0.058', + }, }; 1; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 72f5254..7b5b870 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -47,7 +47,7 @@ use MARC::File::XML ( BinaryEncoding => 'utf8' ); use File::Path qw[remove_tree]; # perl core module use File::Spec; -use File::Slurp; +use Path::Tiny; # FIXME - The user might be installing a new database, so can't rely # on /etc/koha.conf anyway. @@ -12700,7 +12700,7 @@ foreach my $file ( sort readdir $dirh ) { my $installer = C4::Installer->new(); my $rv = $installer->load_sql( $update_dir . $file ) ? 0 : 1; } elsif ( $file =~ /\.perl$/ ) { - my $code = read_file( $update_dir . $file ); + my $code = path( $update_dir . $file )->slurp_utf8; eval $code; say "Atomic update generated errors: $@" if $@; } -- 2.1.4