Imported Upstream version 3.3.0

[debian/amanda] / server-src / amstatus.pl

diff --git a/server-src/amstatus.pl b/server-src/amstatus.pl
index 3fe0ebba286d3a5945722bfa1e6a4739f6f8e8c0..be2b8fe40467e647bdb53201dcae2b9d1051ba5a 100644 (file)
--- a/server-src/amstatus.pl
+++ b/server-src/amstatus.pl
@@ -576,8 +576,12 @@ while($lineX = <AMDUMP>) {
                                        $label=$line[8];
                                        $status_taper = "Idle";
                                        $hostpart=$serial{$serial};
-                                       $line[10] =~ /sec (\S+) kb (\d+) kps/;
-                                       $size=$2 / $unitdivisor;
+                                       $line[10] =~ /sec (\S+) (kb|bytes) (\d+) kps/;
+                                       if ($2 eq 'kb') {
+                                               $size=$3 / $unitdivisor;
+                                  } else {
+                                               $size=$3 / ( $unitdivisor * 1024);
+                                       }
                                        $taper_finished{$hostpart}=1;
                                        $busy_time{"taper"}+=($current_time-$taper_time{$hostpart});
                                        $taper_time{$hostpart}=$current_time;