From 7ac1bc35372990520a7c67870b2c702c41bbebcc 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 Path::Tiny::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 Signed-off-by: Kyle M Hall --- 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 d2e98335de..de00fd718b 100644 --- a/C4/Installer/PerlDependencies.pm +++ b/C4/Installer/PerlDependencies.pm @@ -842,6 +842,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 65153ac54a..7bf758575b 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. @@ -12920,7 +12920,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.11.4.GIT