X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FUser.pm;h=42622f8fdc5d81c9684f840cea1052069aa80993;hb=3171c37870f8d169128b81f35d9a597c03322f00;hp=e3f4a56c47411ce97daff3c00b1b64754a9248ba;hpb=f5093da0934b58d979d44ba9ad961b409e15c411;p=kivitendo-erp.git

diff --git a/SL/User.pm b/SL/User.pm
index e3f4a56c4..42622f8fd 100644
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -374,19 +374,19 @@ 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} };
 
   &dbconnect_vars($form, $db);
 
+  # Flush potentially held database locks.
+  $form->get_standard_dbh->commit;
+
   my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options) or $form->dberror;
 
   $dbh->do($form->{dboptions}) if ($form->{dboptions});
@@ -395,22 +395,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 {