X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Famoverview.pl;h=e4bda6e0b0a3d808a40d95b9aa0fb4489bdfbfe7;hb=fd48f3e498442f0cbff5f3606c7c403d0566150e;hp=0dc5fc1ef98841073401f97e4a31df0497deaefc;hpb=96f35b20267e8b1a1c846d476f27fcd330e0b018;p=debian%2Famanda diff --git a/server-src/amoverview.pl b/server-src/amoverview.pl index 0dc5fc1..e4bda6e 100644 --- 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"; @@ -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}) {