summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/tlpkg/TeXLive/TLConfig.pm13
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm6
-rwxr-xr-xMaster/tlpkg/bin/tl-update-containers13
-rwxr-xr-xMaster/tlpkg/bin/tlpfiles2
4 files changed, 30 insertions, 4 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
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index f1d22b1eb39..dee164e32fb 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -561,6 +561,19 @@ Do not try to sign the resulting TeX Live tlpdb.
Forces rebuild of all containers, including creation of the output
C<texlive.tlpdb> if need be.
+We used to recreate all containers for the release each year. Starting
+with TL20, we longer do this, since it causes files with the same name
+(foo.tar.xz) to change contents, either just compression options, etc.,
+or because the Catalogue values changed. We did not normally push out
+Catalogue-only changes to tlnet during the year since they frequently
+happen without any change to the package itself. Now, instead of the
+yearly recreate, we explicitly push Catalogue-only changes every so
+often using C<tl-update-tlpdb --catalogue-compare> (from C<cron.tl>).
+
+The upshot is that C<-recreate> is now used only for the tlcritical
+repository in C<cron.tl>, and to make new repositories for testing; we
+shouldn't ever use for tlnet.
+
=item B<--help>
Display this documentation and exit.
diff --git a/Master/tlpkg/bin/tlpfiles b/Master/tlpkg/bin/tlpfiles
index 8367bd54172..7a73540b907 100755
--- a/Master/tlpkg/bin/tlpfiles
+++ b/Master/tlpkg/bin/tlpfiles
@@ -41,7 +41,7 @@ exit (&main ());
sub main {
my $Master = "$mydir/../.."; # xx TLPDB should default
- my $tlpdb_path = "$Master/$TeXLive::TLConfig::InfraLocation/texlive.tlpdb";
+ my $tlpdb_path = "$Master/$TeXLive::TLConfig::DatabaseLocation";
if (@opt_pkgof) {
return &do_pkgof ($tlpdb_path, @opt_pkgof);