Konflikt zwischen zwei Upgrade-Scripten beheben

[mfinanz.git] / SL / LXDebug.pm

diff --git a/SL/LXDebug.pm b/SL/LXDebug.pm
index e4e0cb272ec2d609bea6fb315691ef1e6447a92e..13f86a71ab1f4df7fc6ea8ae63bda2f85696ac49 100644 (file)
--- a/SL/LXDebug.pm
+++ b/SL/LXDebug.pm
@@ -16,26 +16,19 @@ use constant DEVEL              => INFO | DEBUG1 | QUERY | TRACE | BACKTRACE_ON_
 use constant FILE_TARGET   => 0;
 use constant STDERR_TARGET => 1;
 
 use constant FILE_TARGET   => 0;
 use constant STDERR_TARGET => 1;
 

+use Data::Dumper;

 use POSIX qw(strftime getppid);
 use Time::HiRes qw(gettimeofday tv_interval);
 use YAML;
 
 use strict;
 
 use POSIX qw(strftime getppid);
 use Time::HiRes qw(gettimeofday tv_interval);
 use YAML;
 
 use strict;
 

-my ($data_dumper_available, $text_diff_available);
+my ($text_diff_available);

 
 

-our $global_level;
-our $watch_form;
+our $global_level = NONE();
+our $watch_form   = 0;

 our $file_name;
 
 our $file_name;
 

-BEGIN {
-  eval("use Data::Dumper");
-  $data_dumper_available = $@ ? 0 : 1;
-
-  $global_level      = NONE;
-  $watch_form        = 0;
-}
-

 sub new {
   my $type = shift;
   my $self = {};
 sub new {
   my $type = shift;
   my $self = {};


@@ -159,33 +152,29 @@ sub warn {
 sub dump {
   my ($self, $level, $name, $variable, %options) = @_;
 
 sub dump {
   my ($self, $level, $name, $variable, %options) = @_;
 

-  if ($data_dumper_available) {
-    my $password;
-    if ($variable && ('Form' eq ref $variable) && defined $variable->{password}) {
-      $password             = $variable->{password};
-      $variable->{password} = 'X' x 8;
-    }
-
-    my $dumper = Data::Dumper->new([$variable]);
-    $dumper->Sortkeys(1);
-    $dumper->Indent(2);
-    $dumper->$_($options{$_}) for keys %options;
-    $self->message($level, "dumping ${name}:\n" . $dumper->Dump());
+  my $password;
+  if ($variable && ('Form' eq ref $variable) && defined $variable->{password}) {
+    $password             = $variable->{password};
+    $variable->{password} = 'X' x 8;
+  }

 
 

-    $variable->{password} = $password if (defined $password);
+  my $dumper = Data::Dumper->new([$variable]);
+  $dumper->Sortkeys(1);
+  $dumper->Indent(2);
+  $dumper->$_($options{$_}) for keys %options;
+  my $output = $dumper->Dump();
+  $self->message($level, "dumping ${name}:\n" . $output);

 
 

-    # Data::Dumper does not reset the iterator belonging to this hash
-    # if 'Sortkeys' is true. Therefore clear the iterator manually.
-    # See "perldoc -f each".
-    if ($variable && (('HASH' eq ref $variable) || ('Form' eq ref $variable))) {
-      keys %{ $variable };
-    }
+  $variable->{password} = $password if (defined $password);

 
 

-  } else {
-    $self->message($level,
-                   "dumping ${name}: Data::Dumper not available; "
-                     . "variable cannot be dumped");
+  # Data::Dumper does not reset the iterator belonging to this hash
+  # if 'Sortkeys' is true. Therefore clear the iterator manually.
+  # See "perldoc -f each".
+  if ($variable && (('HASH' eq ref $variable) || ('Form' eq ref $variable))) {
+    keys %{ $variable };

   }
   }

+
+  return $output;

 }
 
 sub dump_yaml {
 }
 
 sub dump_yaml {