From d846366de676eec4ef7e6921cdee56958aa44af1 Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Wed, 1 Aug 2012 11:41:19 +0200 Subject: [PATCH] Bug 7167 reindentation & removing dead code Content-Type: text/plain; charset="utf-8" * The if (! defined $ENV{PERL5LIB}... block was wrongly intented * The 3 lines running update.pl are useless: the update (new mechanism) is run from admin/updatedatabase.pl script. This part of install.pl is run only when you have "old style" DB revisions. Summary: * old mechanism = it's run as previously, by reaching the installer/install.pl?step=3 page, that applies all revisions * new mechanism = when you log-in or reach mainpage.pl, you reach admin/updatedatabase.pl, where you can see what will be run, and run it Tiny side effect = the check for old mechanism is now done *after* authentification (thus it's not done on each page call). It means that the user will have to enter login/password twice : * first to log-in to Koha * second to run installer/updatedatabase.pl?step=3 As the old mechanism is deprecated, we can expect this will happend only a few time in the history of a setup, it's not a big deal. Signed-off-by: Chris Nighswonger --- installer/install.pl | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/installer/install.pl b/installer/install.pl index 6b97cba..01360e6 100755 --- a/installer/install.pl +++ b/installer/install.pl @@ -312,14 +312,13 @@ elsif ( $step && $step == 3 ) { # Not 1st install, the only sub-step : update database # #Do updatedatabase And report - - if ( ! defined $ENV{PERL5LIB} ) { - my $find = "C4/Context.pm"; - my $path = $INC{$find}; - $path =~ s/\Q$find\E//; - $ENV{PERL5LIB} = "$path:$path/installer"; - warn "# plack? inserted PERL5LIB $ENV{PERL5LIB}\n"; - } + if ( ! defined $ENV{PERL5LIB} ) { + my $find = "C4/Context.pm"; + my $path = $INC{$find}; + $path =~ s/\Q$find\E//; + $ENV{PERL5LIB} = "$path:$path/installer"; + warn "# plack? inserted PERL5LIB $ENV{PERL5LIB}\n"; + } my $koha39 = "3.0900028"; my $cmd; @@ -331,10 +330,6 @@ elsif ( $step && $step == 3 ) { print_std( "updatedatabase.pl", $stdout_buf, $stderr_buf ); $current_version= $koha39; } - $cmd = C4::Context->config("intranetdir") . "/installer/data/$info{dbms}/update.pl -all -min=$current_version"; - my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) = IPC::Cmd::run(command => $cmd, verbose => 0); - print_std( "update.pl", $stdout_buf, $stderr_buf ); - $template->param( $op => 1 ); } else { -- 1.7.9.5