Imported Upstream version 3.3.0

[debian/amanda] / perl / Amanda / Report.pm

diff --git a/perl/Amanda/Report.pm b/perl/Amanda/Report.pm
index 94e79e75bc13cc7af8a7374c2da730889a0a89e6..78a3c303425ca1508ab546aea68897eb9bebd44c 100644 (file)
--- a/perl/Amanda/Report.pm
+++ b/perl/Amanda/Report.pm
@@ -790,6 +790,7 @@ sub _handle_dumper_line
         my @info = Amanda::Util::split_quoted_strings($str);
         my ( $hostname, $disk, $level ) = @info[ 0 .. 2 ];
         my ( $sec, $kb, $kps, $orig_kb ) = @info[ 4, 6, 8, 10 ];
+       $kb = int($kb/1024) if $info[4] eq 'bytes';
         $orig_kb =~ s{\]$}{};
 
         my $dle    = $disklist->{$hostname}->{$disk};
@@ -817,6 +818,7 @@ sub _handle_dumper_line
         my @info = Amanda::Util::split_quoted_strings($str);
         my ( $hostname, $disk, $timestamp, $level ) = @info[ 0 .. 3 ];
         my ( $sec, $kb, $kps, $orig_kb ) = @info[ 5, 7, 9, 11 ];
+       $kb = int($kb/1024) if $info[6] eq 'bytes';
         $orig_kb =~ s{\]$}{};
 
         my $dle    = $disklist->{$hostname}->{$disk};
@@ -864,6 +866,7 @@ sub _handle_chunker_line
         my @info = Amanda::Util::split_quoted_strings($str);
         my ( $hostname, $disk, $timestamp, $level ) = @info[ 0 .. 3 ];
         my ( $sec, $kb, $kps ) = @info[ 5, 7, 9 ];
+       $kb = int($kb/1024) if $info[6] eq 'bytes';
         $kps =~ s{\]$}{};
 
         my $dle     = $disklist->{$hostname}->{$disk};
@@ -930,6 +933,7 @@ sub _handle_taper_line
         my ( $currpart, $predparts ) = ( $1, $2 );
 
         my ($level, $sec, $kb, $kps, $orig_kb) = @info[ 6, 8, 10, 12, 14 ];
+       $kb = int($kb/1024) if $info[9] eq 'bytes';
         $kps =~ s{\]$}{};
         $orig_kb =~ s{\]$}{} if defined($orig_kb);
 
@@ -967,6 +971,7 @@ sub _handle_taper_line
         my @info = Amanda::Util::split_quoted_strings($str);
         my ( $hostname, $disk, $timestamp, $part_ct, $level ) = @info[ 0 .. 4 ];
         my ( $sec, $kb, $kps, $orig_kb ) = @info[ 6, 8, 10, 12 ];
+       $kb = int($kb/1024) if $info[7] eq 'bytes';
        my $error;
        if ($type == $L_PARTIAL) {
            if ($kps =~ /\]$/) {