From 9e61cdfdcd3cf4eba2f3e274ed19a191bc56ff59 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 29 Aug 2013 13:20:01 +0200 Subject: [PATCH] Kosmetik: useless code removal --- SL/User.pm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/SL/User.pm b/SL/User.pm index e3f4a56c4..8bb9b997b 100644 --- a/SL/User.pm +++ b/SL/User.pm @@ -374,14 +374,11 @@ sub create_schema_info_table { } sub dbupdate2 { - $main::lxdebug->enter_sub(); - my ($self, %params) = @_; my $form = $params{form}; my $dbupdater = $params{updater}; my $db = $params{database}; - my $rc = -2; map { $_->{description} = SL::Iconv::convert($_->{charset}, 'UTF-8', $_->{description}) } values %{ $dbupdater->{all_controls} }; @@ -395,22 +392,17 @@ sub dbupdate2 { my @upgradescripts = $dbupdater->unapplied_upgrade_scripts($dbh); - $dbh->disconnect and next if !@upgradescripts; - foreach my $control (@upgradescripts) { - # apply upgrade + # Apply upgrade. Control will only return to us if the upgrade has + # been applied correctly and if the update has not requested user + # interaction. $main::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $control->{file}"); print $form->parse_html_template("dbupgrade/upgrade_message2", $control); $dbupdater->process_file($dbh, "sql/Pg-upgrade2/$control->{file}", $control); } - $rc = 0; $dbh->disconnect; - - $main::lxdebug->leave_sub(); - - return $rc; } sub data { -- 2.20.1