texlive[53037] Master/tlpkg: new abbreviation $DatabaseLocation for

[commits+karl at tug.org]

Revision: 53037
          http://tug.org/svn/texlive?view=revision&revision=53037
Author:   karl
Date:     2019-12-06 00:53:35 +0100 (Fri, 06 Dec 2019)
Log Message:
-----------
new abbreviation $DatabaseLocation for tlpkg/texlive.tlpdb; use it in a few places

Modified Paths:
--------------
    trunk/Master/tlpkg/TeXLive/TLConfig.pm
    trunk/Master/tlpkg/TeXLive/TLPDB.pm
    trunk/Master/tlpkg/bin/tl-update-containers
    trunk/Master/tlpkg/bin/tlpfiles

Modified: trunk/Master/tlpkg/TeXLive/TLConfig.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLConfig.pm	2019-12-05 23:18:53 UTC (rev 53036)
+++ trunk/Master/tlpkg/TeXLive/TLConfig.pm	2019-12-05 23:53:35 UTC (rev 53037)
@@ -30,6 +30,7 @@
     %Compressors
     $InfraLocation
     $DatabaseName
+    $DatabaseLocation
     $PackageBackupDir 
     $BlockSize
     $Archive
@@ -82,10 +83,12 @@
 # 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 @@
 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.

Modified: trunk/Master/tlpkg/TeXLive/TLPDB.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLPDB.pm	2019-12-05 23:18:53 UTC (rev 53036)
+++ trunk/Master/tlpkg/TeXLive/TLPDB.pm	2019-12-05 23:53:35 UTC (rev 53037)
@@ -91,7 +91,7 @@
 =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 @@
   } 
   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 @@
     tlwarn("TLPDB: cannot get location of a virtual tlpdb\n");
     return 0;
   }
-  return "$self->{'root'}/$InfraLocation/$DatabaseName";
+  return "$self->{'root'}/$DatabaseLocation";
 }
 
 =pod

Modified: trunk/Master/tlpkg/bin/tl-update-containers
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-containers	2019-12-05 23:18:53 UTC (rev 53036)
+++ trunk/Master/tlpkg/bin/tl-update-containers	2019-12-05 23:53:35 UTC (rev 53037)
@@ -561,6 +561,19 @@
 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.

Modified: trunk/Master/tlpkg/bin/tlpfiles
===================================================================
--- trunk/Master/tlpkg/bin/tlpfiles	2019-12-05 23:18:53 UTC (rev 53036)
+++ trunk/Master/tlpkg/bin/tlpfiles	2019-12-05 23:53:35 UTC (rev 53037)
@@ -41,7 +41,7 @@
 

 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);