Imported Upstream version 2.5.1p1

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

diff --git a/server-src/amstatus.pl.in b/server-src/amstatus.pl.in
index e4ad2aa1de07a0d4275923c94fa51f5fe4a1996c..f95d33c4a24bed99ccee4e4c93fad9087eebaf68 100644 (file)
--- a/server-src/amstatus.pl.in
+++ b/server-src/amstatus.pl.in
@@ -717,20 +717,22 @@ while(<AMDUMP>) {
                %free = split (/ +/, $2);
                %qlen = split (/ +/, $5);
 
-               if($status_driver ne "") {
-                       $dumpers_active[$dumpers_active_prev]
-                               +=$current_time-$state_time_prev;
-                       $dumpers_held[$dumpers_active_prev]{$status_driver}
-                               +=$current_time-$state_time_prev;
-               }
-               $state_time_prev=$current_time;
-               $dumpers_active_prev=$dumpers_active;
-               $status_driver=$6;
-               if(! defined($dumpers_held[$dumpers_active]{$status_driver})) {
-                       $dumpers_held[$dumpers_active]{$status_driver}=0;
+               if(defined($dumpers_active)) {
+                       if($status_driver ne "") {
+                               $dumpers_active[$dumpers_active_prev]
+                                       +=$current_time-$state_time_prev;
+                               $dumpers_held[$dumpers_active_prev]{$status_driver}
+                                       +=$current_time-$state_time_prev;
+                       }
+                       $state_time_prev=$current_time;
+                       $dumpers_active_prev=$dumpers_active;
+                       $status_driver=$6;
+                       if(! defined($dumpers_held[$dumpers_active]{$status_driver})) {
+                               $dumpers_held[$dumpers_active]{$status_driver}=0;
+                       }
                }
        }
-       elsif(/taper: wrote label `(\S*)'/) {
+       elsif(/taper: .*wrote label `(\S*)'/) {
                $nb_tape++;
                $ntlabel{$nb_tape} = $1;
                $ntpartition{$nb_tape} = 0;