summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-12-05 23:53:35 +0000
committerKarl Berry <karl@freefriends.org>2019-12-05 23:53:35 +0000
commit3745e0216c9d22e511d2195fdf34d741c861ab08 (patch)
treeaca628e1729d9d8eb1e639b4029d77e12b170ef8 /Master/tlpkg/TeXLive
parent60fdf1b92914c2adc782fc066d8381fb59dd2953 (diff)
new abbreviation $DatabaseLocation for tlpkg/texlive.tlpdb; use it in a few places
git-svn-id: svn://tug.org/texlive/trunk@53037 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive')
-rw-r--r--Master/tlpkg/TeXLive/TLConfig.pm13
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm6
2 files changed, 16 insertions, 3 deletions
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index 8e698297cc0..8b7f76122b4 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -30,6 +30,7 @@ BEGIN {
%Compressors
$InfraLocation
$DatabaseName
+ $DatabaseLocation
$PackageBackupDir
$BlockSize
$Archive
@@ -82,10 +83,12 @@ our $DefaultCategory = "Package";
# relative to a root (e.g., the Master/, or the installation path)
our $InfraLocation = "tlpkg";
our $DatabaseName = "texlive.tlpdb";
+our $DatabaseLocation = "$InfraLocation/$DatabaseName";
# location of backups in default autobackup setting (under tlpkg)
our $PackageBackupDir = "$InfraLocation/backups";
+# for computing disk usage; this is most common.
our $BlockSize = 4096;
# timeout for network connections (wget, LWP) in seconds
@@ -312,6 +315,16 @@ The subdirectory with various infrastructure files (C<texlive.tlpdb>,
tlpobj files, ...) relative to the root of the installation; currently
C<tlpkg>.
+=item C<$TeXLive::TLConfig::DatabaseName>
+
+The name of our so-called database file: C<texlive.tlpdb>. It's just a
+plain text file, not any kind of relational or other database.
+
+=item C<$TeXLive::TLConfig::DatabaseLocation>
+
+Concatenation of C<InfraLocation> "/" C<DatabaseName>, i.e.,
+C<tlpkg/texlive.tlpdb>.
+
=item C<$TeXLive::TLConfig::BlockSize>
The assumed block size, currently 4k.
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index 865e3c67ac4..5ff686d5a78 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -91,7 +91,7 @@ C<TeXLive::TLPDB> -- A database of TeX Live Packages
=cut
use TeXLive::TLConfig qw($CategoriesRegexp $DefaultCategory $InfraLocation
- $DatabaseName $MetaCategoriesRegexp $Archive
+ $DatabaseName $DatabaseLocation $MetaCategoriesRegexp $Archive
$DefaultCompressorFormat %Compressors $CompressorExtRegexp
%TLPDBOptions %TLPDBSettings $ChecksumExtension
$RelocPrefix $RelocTree);
@@ -148,7 +148,7 @@ sub new {
}
if (defined($self->{'root'})) {
my $nr_packages_read
- = $self->from_file("$self->{'root'}/$InfraLocation/$DatabaseName",
+ = $self->from_file("$self->{'root'}/$DatabaseLocation",
'verify' => $verify);
if ($nr_packages_read == 0) {
# that is bad, we didn't read anything, so return undef.
@@ -1205,7 +1205,7 @@ sub location {
tlwarn("TLPDB: cannot get location of a virtual tlpdb\n");
return 0;
}
- return "$self->{'root'}/$InfraLocation/$DatabaseName";
+ return "$self->{'root'}/$DatabaseLocation";
}
=pod