From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Fri, 28 Jan 2011 12:50:33 +0000 (+0100)
Subject: rename MaxArchiveFileSize to ArchiveChunkSize
X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=commitdiff_plain;h=6e361dfbcfd712fd68d507a90cf3a0b5f7a089cd

rename MaxArchiveFileSize to ArchiveChunkSize

grep -rl MaxArchiveFileSize . | xargs -i sh -cv "perl -p -i -n -e 's/MaxArchiveFileSize/ArchiveChunkSize/' {}"
---

diff --git a/bin/BackupPC_ASA_PostArchive_Update b/bin/BackupPC_ASA_PostArchive_Update
index 3ffb763..8d69bf6 100755
--- a/bin/BackupPC_ASA_PostArchive_Update
+++ b/bin/BackupPC_ASA_PostArchive_Update
@@ -263,8 +263,8 @@ sub check_archive {
 			$items++;
 			$tar_size_inarc += $entry->size;
 
-			if ($tar_size_inarc > $Conf{MaxArchiveFileSize}) {
-				print ", part $filename is too big $tar_size_inarc > $Conf{MaxArchiveFileSize}\n";
+			if ($tar_size_inarc > $Conf{ArchiveChunkSize}) {
+				print ", part $filename is too big $tar_size_inarc > $Conf{ArchiveChunkSize}\n";
 				return 0;
 			}
 
diff --git a/bin/BackupPC_tarIncCreate b/bin/BackupPC_tarIncCreate
index 3cad08f..a76e439 100755
--- a/bin/BackupPC_tarIncCreate
+++ b/bin/BackupPC_tarIncCreate
@@ -196,7 +196,7 @@ my(%HardLinkExtraFiles, @HardLinks);
 # Write out all the requested files/directories
 #
 
-my $max_file_size = $Conf{'MaxArchiveFileSize'} || die "problem with MaxArchiveFileSize parametar";
+my $max_file_size = $Conf{'ArchiveChunkSize'} || die "problem with MaxArchiveFileSize parametar";
 
 my $tar_dir = $Conf{GzipTempDir};
 die "problem with $tar_dir, check GzipTempDir in configuration\n" unless (-d $tar_dir && -w $tar_dir);
@@ -657,7 +657,7 @@ sub TarWriteFile
     my $size = $in_backup_increment->{$tarPath};
     return unless (defined($size));
 
-    # is this file too large to fit into MaxArchiveFileSize?
+    # is this file too large to fit into ArchiveChunkSize?
 
     if ( ($current_tar_size + tar_overhead($tarPath) + $size) > $max_file_size ) {
 	print STDERR "# tar file $current_tar_size + $tar_header_length + $size > $max_file_size, splitting\n" if ($opts{d});
diff --git a/conf/config.pl b/conf/config.pl
index 235fe0b..d852607 100644
--- a/conf/config.pl
+++ b/conf/config.pl
@@ -2319,8 +2319,8 @@ $Conf{ArchiveMediaSize} = 4404019200;
 #
 # maximum size of one (uncompressed) file on archive medium (in bytes)
 # default: 2Gb - 2k for DVD
-#$Conf{MaxArchiveFileSize} = (2048 - 2) * 1024 * 1024;
-$Conf{MaxArchiveFileSize} = 2145386496;
+#$Conf{ArchiveChunkSize} = (2048 - 2) * 1024 * 1024;
+$Conf{ArchiveChunkSize} = 2145386496;
 
 #
 # Temporary directory for ISO images (relative to install dir)
diff --git a/lib/BackupPC/Search.pm b/lib/BackupPC/Search.pm
index c996568..b1b8bea 100644
--- a/lib/BackupPC/Search.pm
+++ b/lib/BackupPC/Search.pm
@@ -470,7 +470,7 @@ sub displayBackupsGrid($) {
 	my $param = shift;
 
 	my $max_archive_size = $Conf{ArchiveMediaSize} || die "no ArchiveMediaSize";
-	my $max_archive_file_size = $Conf{MaxArchiveFileSize}  || die "no MaxFileInSize";
+	my $max_archive_file_size = $Conf{ArchiveChunkSize}  || die "no MaxFileInSize";
 
 	my $retHTML .= q{
 		<form id="forma" method="POST" action="}.$MyURL.q{?action=burn">