Merge branch 'master' of ssh://git-sdonath@lx-office.linet-services.de/~/lx-office-erp

[kivitendo-erp.git] / SL / DBUpgrade2.pm

diff --git a/SL/DBUpgrade2.pm b/SL/DBUpgrade2.pm
index cb8a9b2..ae07d1c 100644 (file)
--- a/SL/DBUpgrade2.pm
+++ b/SL/DBUpgrade2.pm
@@ -3,9 +3,11 @@ package SL::DBUpgrade2;
 use SL::Common;
 
 require Exporter;
-@ISA = qw(Exporter);
+our @ISA = qw(Exporter);
 
-@EXPORT = qw(parse_dbupdate_controls sort_dbupdate_controls);
+our @EXPORT = qw(parse_dbupdate_controls sort_dbupdate_controls);
+
+use strict;
 
 sub parse_dbupdate_controls {
   $main::lxdebug->enter_sub();
@@ -47,6 +49,8 @@ sub parse_dbupdate_controls {
       }
     }
 
+    next if ($control->{ignore});
+
     $control->{charset} ||= Common::DEFAULT_CHARSET;
 
     if (!$control->{"tag"}) {
@@ -122,13 +126,13 @@ sub _control_error {
 }
 
 sub _dbupdate2_calculate_depth {
-  $main::lxdebug->enter_sub();
+  $main::lxdebug->enter_sub(2);
 
   my ($tree, $tag) = @_;
 
   my $node = $tree->{$tag};
 
-  return $main::lxdebug->leave_sub() if (defined($node->{"depth"}));
+  return $main::lxdebug->leave_sub(2) if (defined($node->{"depth"}));
 
   my $max_depth = 0;
 
@@ -140,7 +144,7 @@ sub _dbupdate2_calculate_depth {
 
   $node->{"depth"} = $max_depth + 1;
 
-  $main::lxdebug->leave_sub();
+  $main::lxdebug->leave_sub(2);
 }
 
 sub sort_dbupdate_controls {