projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 0dc5fc1ef98841073401f97e4a31df0497deaefc..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@";
# 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";
# overrideable defaults
my $opt_config = "$config";
@@
-129,13
+122,14
@@
while (<$fh>) {
next if /skipping cruft directory/;
next if /skip-incr/;
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 "";
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;
if($time !~/^\d\d:\d\d:\d\d$/) {
$status = $part;
$part = $file;
@@
-145,6
+139,7
@@
while (<$fh>) {
$disk = $host;
$host = $time;
}
$disk = $host;
$host = $time;
}
+ next if ($part != 1);
if ($date =~ /^\d\d\d\d-\d\d-\d\d$/) {
if(defined $disks{$host}{$disk}) {
if ($date =~ /^\d\d\d\d-\d\d-\d\d$/) {
if(defined $disks{$host}{$disk}) {