X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=perl%2FAmanda%2FTapelist.swg;h=b514cac9020648b3ab2b217cdd07556b0fc484c0;hb=c6f0a88c567f8536c498f554285aed1f8150da18;hp=d15217abfc8d09f90f2912153ca261db30a4e5ec;hpb=cd0b924f27312d57bd42f6c4fae2b795139e2d0b;p=debian%2Famanda

diff --git a/perl/Amanda/Tapelist.swg b/perl/Amanda/Tapelist.swg
index d15217a..b514cac 100644
--- a/perl/Amanda/Tapelist.swg
+++ b/perl/Amanda/Tapelist.swg
@@ -124,7 +124,7 @@ sub remove_tapelabel {
 
 sub add_tapelabel {
     my $self = shift;
-    my ($datestamp, $label, $comment, $reuse, $meta, $barcode) = @_;
+    my ($datestamp, $label, $comment, $reuse, $meta, $barcode, $blocksize) = @_;
     $reuse = 1 if !defined $reuse;
 
     # prepend this (presumably new) volume to the beginning of the list
@@ -134,6 +134,7 @@ sub add_tapelabel {
         'reuse'     => $reuse,
         'barcode'   => $barcode,
         'meta'      => $meta,
+        'blocksize' => $blocksize,
         'comment'   => $comment,
     };
     my $tles = $self->{'tles'};
@@ -172,8 +173,9 @@ sub write {
 	my $reuse = $tle->{'reuse'} ? 'reuse' : 'no-reuse';
 	my $barcode = (defined $tle->{'barcode'})? (" BARCODE:" . $tle->{'barcode'}) : '';
 	my $meta = (defined $tle->{'meta'})? (" META:" . $tle->{'meta'}) : '';
+	my $blocksize = (defined $tle->{'blocksize'})? (" BLOCKSIZE:" . $tle->{'blocksize'}) : '';
 	my $comment = (defined $tle->{'comment'})? (" #" . $tle->{'comment'}) : '';
-	$result &&= print $fhn "$datestamp $label $reuse$barcode$meta$comment\n";
+	$result &&= print $fhn "$datestamp $label $reuse$barcode$meta$blocksize$comment\n";
     }
     my $result_close = close($fhn);
     $result &&= $result_close;
@@ -225,8 +227,8 @@ sub _read_tapelist {
     my @tles;
     open(my $fh, "<", $self->{'filename'}) or return $self;
     while (my $line = <$fh>) {
-	my ($datestamp, $label, $reuse, $barcode, $meta, $comment)
-	    = $line =~ m/^([0-9]*)\s([^\s]*)\s(reuse|no-reuse)\s*(?:BARCODE:([^\s]*))?\s*(?:META:([^\s]*))?\s*(?:\#(.*))?$/mx;
+	my ($datestamp, $label, $reuse, $barcode, $meta, $blocksize, $comment)
+	    = $line =~ m/^([0-9]*)\s([^\s]*)\s(reuse|no-reuse)\s*(?:BARCODE:([^\s]*))?\s*(?:META:([^\s]*))?\s*(?:BLOCKSIZE:([^\s]*))?\s*(?:\#(.*))?$/mx;
 	next if !defined $datestamp; # silently filter out bogus lines
 	push @tles, {
 	    'datestamp' => $datestamp,
@@ -234,6 +236,7 @@ sub _read_tapelist {
 	    'reuse' => ($reuse eq 'reuse'),
 	    'barcode' => $barcode,
 	    'meta' => $meta,
+	    'blocksize' => $blocksize,
 	    'comment' => $comment,
 	};
     }