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.3.1
[debian/amanda]
/
perl
/
Amanda
/
Taper
/
Scan
/
oldest.pm
diff --git
a/perl/Amanda/Taper/Scan/oldest.pm
b/perl/Amanda/Taper/Scan/oldest.pm
index 3c9fc6a1b56788d9ee3303c768c95a8c981e8ca6..a7945a8d99c835646b534d0b83ef83d88349b561 100644
(file)
--- a/
perl/Amanda/Taper/Scan/oldest.pm
+++ b/
perl/Amanda/Taper/Scan/oldest.pm
@@
-131,17
+131,13
@@
sub analyze {
if ($vol_tle->{'datestamp'} eq '0') {
push @new_labeled, $sl;
}
if ($vol_tle->{'datestamp'} eq '0') {
push @new_labeled, $sl;
}
- } elsif ($self->{'chg'}->volume_is_labelable($sl->{'device_status'},
- $sl->{'f_type'},
- $sl->{'label'})) {
+ } elsif ($self->volume_is_labelable($sl)) {
$first_new_volume = $sl if !$first_new_volume;
$new_volume = $sl if $current && !$new_volume;
push @new_volume, $sl;
}
}
$first_new_volume = $sl if !$first_new_volume;
$new_volume = $sl if $current && !$new_volume;
push @new_volume, $sl;
}
}
- } elsif ($self->{'chg'}->volume_is_labelable($sl->{'device_status'},
- $sl->{'f_type'},
- $sl->{'label'})) {
+ } elsif ($self->volume_is_labelable($sl)) {
$first_new_volume = $sl if !$first_new_volume;
$new_volume = $sl if $current && !$new_volume;
push @new_volume, $sl;
$first_new_volume = $sl if !$first_new_volume;
$new_volume = $sl if $current && !$new_volume;
push @new_volume, $sl;
@@
-184,6
+180,7
@@
sub analyze {
for my $sl (@new_volume) {
$sl->{'label'} = $self->{'chg'}->make_new_tape_label(
barcode => $sl->{'barcode'},
for my $sl (@new_volume) {
$sl->{'label'} = $self->{'chg'}->make_new_tape_label(
barcode => $sl->{'barcode'},
+ slot => $sl->{'slot'},
meta => $sl->{'meta'});
$new_volume = $sl if defined $last_label and
$new_volume->{'label'} ne $sl->{'label'} and
meta => $sl->{'meta'});
$new_volume = $sl if defined $last_label and
$new_volume->{'label'} ne $sl->{'label'} and