From 9e7e29b2e2eed3635c03659db51f9550ad7f23bd 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. Signed-off-by: Aleisha Amohia Signed-off-by: Jonathan Druart --- 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 a064307..7d37d39 100644 --- a/C4/Installer/PerlDependencies.pm +++ b/C4/Installer/PerlDependencies.pm @@ -837,6 +837,11 @@ our $PERL_DEPS = { required => 1, min_ver => '0.28', }, + '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 5585b89..637b53d 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. @@ -12848,7 +12848,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.8.1