Imported Upstream version 3.1.0

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

diff --git a/server-src/amoverview.pl b/server-src/amoverview.pl
index 35594e4eaf85b4ed033239cffb13e5ee40320547..e4bda6e0b0a3d808a40d95b9aa0fb4489bdfbfe7 100644 (file)
--- a/server-src/amoverview.pl
+++ b/server-src/amoverview.pl
@@ -46,14 +46,7 @@ my $confdir="@CONFIG_DIR@";
 # The default configuration.
 my $config="@DEFAULT_CONFIG@";
 
-# Get the version suffix.
-my $USE_VERSION_SUFFIXES = '@USE_VERSION_SUFFIXES@';
-my $suf = '';
-if ( $USE_VERSION_SUFFIXES =~ /^yes$/i ) {
-       $suf='-@VERSION@';
-}
-
-my $amadmin    = "$sbindir/amadmin$suf";
+my $amadmin    = "$sbindir/amadmin";
 
 # overrideable defaults
 my $opt_config         = "$config";
@@ -104,7 +97,7 @@ my $dlfh = new FileHandle "$amadmin $opt_config disklist|" or
     die "$0: error in opening `$amadmin $opt_config disklist' pipe: $!\n";
 $/ = "";
 while (<$dlfh>) {
-    ($host, $disk) = m/    host (.*?):.*    disk (.*?):.*strategy (STANDARD|NOFULL|NOINC|HANOI|INCRONLY).*ignore NO/s;
+    ($host, $disk) = m/    host (.*?):\n.*    disk (.*?):\n.*strategy (STANDARD|NOFULL|NOINC|HANOI|INCRONLY).*ignore NO/ms;
     next unless $host;
     $disks{$host}{$disk}++;
 }
@@ -129,13 +122,14 @@ while (<$fh>) {
     next if /skipping cruft directory/;
     next if /skip-incr/;
 
-    ($date, $time, $host, $disk, $level, $tape, $file, $part, $status) = shellwords($_);
+    ($date, $time, $host, $disk, $level, $tape, $file, $part, $status, $remaining) = shellwords($_);
 
     next if $date eq 'date';
     next if $date eq 'Warning:';
     next if $date eq 'Scanning';
     next if $date eq "";
 
+    $status .= " " . $remaining;
     if($time !~/^\d\d:\d\d:\d\d$/) {
        $status = $part;
        $part = $file;
@@ -145,6 +139,7 @@ while (<$fh>) {
        $disk = $host;
        $host = $time;
     }
+    next if ($part != 1);
 
     if ($date =~ /^\d\d\d\d-\d\d-\d\d$/) {
        if(defined $disks{$host}{$disk}) {