From 1538b3a5e9e0c853ae2c9385973580fff018538d Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 20 Mar 2015 13:24:38 -0400 Subject: [PATCH] Bug 13068 [QA Followup] - Fix reading of sql files list --- installer/data/mysql/updatedatabase.pl | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index c23e770..b2ef3af 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -9914,14 +9914,13 @@ if(CheckVersion($DBversion)) { # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -opendir( my $dirh, C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate' ); -my $old_delimiter = $/; -$/ = ';'; -while (readdir $dirh) { - next unless $_ =~ /\.sql$/; # skip non SQL files - print "DEV atomic update : $_ \n"; +my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/'; +opendir( my $dirh, $update_dir ); +while ( my $file = readdir $dirh ) { + next unless $file =~ /\.sql$/; # skip non SQL files + print "DEV atomic update : $file \n"; my $installer = C4::Installer->new(); - my $rv = $installer->load_sql( C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/' . $_ )? 0: 1; + my $rv = $installer->load_sql( $update_dir . $file ) ? 0 : 1; } -- 1.7.2.5