texlive[47611] Master/tlpkg/bin: update 00texlive.{installer,image}

commits+karl at tug.org commits+karl at tug.org
Fri May 4 19:53:27 CEST 2018


Revision: 47611
          http://tug.org/svn/texlive?view=revision&revision=47611
Author:   karl
Date:     2018-05-04 19:53:27 +0200 (Fri, 04 May 2018)
Log Message:
-----------
update 00texlive.{installer,image} in tlnet; report from texlive at schoepfer.info, 03 May 2018 18:49:46

Modified Paths:
--------------
    trunk/Master/tlpkg/bin/tl-update-containers
    trunk/Master/tlpkg/bin/tl-update-tlnet

Modified: trunk/Master/tlpkg/bin/tl-update-containers
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-containers	2018-05-04 17:45:32 UTC (rev 47610)
+++ trunk/Master/tlpkg/bin/tl-update-containers	2018-05-04 17:53:27 UTC (rev 47611)
@@ -44,7 +44,7 @@
 TeXLive::TLUtils::process_logging_options();
 GetOptions(
   "all|a"       => \$opt_all,
-  "dry-run|n"	=> \$opt_dry,
+  "dry-run|n"	  => \$opt_dry,
   "gpgcmd=s"    => \$opt_gpgcmd,
   "location=s"  => \$opt_location, 
   "master=s"    => \$opt_master,
@@ -52,7 +52,7 @@
   "no-sign"     => \$opt_nosign,
   "recreate"    => \$opt_recreate,
   "relative!"   => \$opt_relative,
-  "version"	=> \$opt_version,
+  "version"	    => \$opt_version,
   "help|?"      => \$opt_help) or pod2usage(1);
 
 pod2usage("-exitstatus" => 0, "-verbose" => 2) if $opt_help;
@@ -201,11 +201,18 @@
   
   # The two packages 00texlive.config and 00texlive.installation
   # are essential and have to be included in each and every case.
-  # So add them ...
-  my $tlpconfig = $tlpdb->get_package("00texlive.config");
-  $nettlpdb->add_tlpobj($tlpconfig);
-  my $tlpinstconfig = $tlpdb->get_package("00texlive.installation");
-  $nettlpdb->add_tlpobj($tlpinstconfig);
+  # 
+  # 00texlive.installer and 00texlive.image are not essential, but keep
+  # them up to date in the net directory (tlnet) to avoid stale data in
+  # the tlpdb there.
+  # 
+  # If more 00texlive.* packages are needed in tlpdb in the future,
+  # most likely they should be added here too.
+  # 
+  for my $name (qw(config installation installer image)) {
+    my $tlp00 = $tlpdb->get_package("00texlive.$name");
+    $nettlpdb->add_tlpobj($tlp00);
+  }
 
   # set up the programs.
   if ($opt_nosetup) {
@@ -214,7 +221,8 @@
     $::progs{'tar'} = "tar";
   } else {
     # do a full setup
-    my $ret = &TeXLive::TLUtils::setup_programs("$script_master/tlpkg/installer");
+    my $ret
+         = &TeXLive::TLUtils::setup_programs("$script_master/tlpkg/installer");
     if ($ret == -1) {
       tlwarn("$0: no xzdec for $::_platform_, aborting.\n");
       exit 1;
@@ -286,8 +294,8 @@
         my $objsrc = $obj->srcfiles_package;
         $objcopy->clear_srcfiles;
         if ($objsrc) {
-          my ($s,$m) = $objsrc->make_container($type, $Master, $opt_containerdir,
-                                              "$pkg.source", $do_relative);
+          my ($s,$m) = $objsrc->make_container($type, $Master,
+                               $opt_containerdir, "$pkg.source", $do_relative);
           if ($s > 0) {
             # something was created 
             # important, we have to add it to the original $obj
@@ -411,7 +419,7 @@
     }
     xchdir($olddir);
   } else {
-    tlwarn("chdir($opt_location/tlpkg/) for md5/checksum creation failed\n: $?");
+   tldie("chdir($opt_location/tlpkg/) for md5/checksum creation failed\n: $!");
   }
   
   if (! @ARGV) {
@@ -445,8 +453,8 @@
 =item B<-all|-a>
 
 Include packages deemed critical in the update, currently
-C<texlive.infra>.  (That is, C<tlmgr> itself needs
-testing before updating, so we don't do it by default.)
+C<texlive.infra>.  That is, since C<tlmgr> changes should
+be tested before released, we don't update these packages by default.
 
 =item B<-dry-run|-n>
 
@@ -459,7 +467,8 @@
 
 =item B<-master> I</path/to/source>
 
-The directory from which containers should be updated. 
+The directory from which containers should be updated, by default the
+grandparent of this script's location.
 
 =item B<-no-relative>
 
@@ -468,7 +477,7 @@
 =item B<-no-setup>
 
 Do not try to use the TL version of our basic programs such as I<xz>
-and I<tar>, but instead looks for them in the current path.
+and I<tar>, but instead look for them in the current path.
 
 =item B<-no-sign>
 
@@ -500,8 +509,9 @@
 =head1 DESCRIPTION
 
 This program compares the packages in the C<texlive.tlpdb> found
-relative to this script with those in the C<texlive.tlpdb> found in the
-specified I<containerdir>.
+relative to this script (typicallly the development tree) with those in
+the C<texlive.tlpdb> found in the specified I<containerdir> (typically
+the network distribution tree, tlnet).
 
 If a local tlpdb package is newer (i.e., a higher revision number), the
 container(s) for the package are updated.  When the package exists in

Modified: trunk/Master/tlpkg/bin/tl-update-tlnet
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-tlnet	2018-05-04 17:45:32 UTC (rev 47610)
+++ trunk/Master/tlpkg/bin/tl-update-tlnet	2018-05-04 17:53:27 UTC (rev 47611)
@@ -93,7 +93,7 @@
 echo "$0: Updating $tltry with cow-shell..."
 cd $tltry
 cow-shell <<END_COW
-echo "$0: Running tl-update-containers with"
+echo "$0: Running tl-update-containers (from $Master) with"
 echo "$0:   gpgcmd=$gpgcmd critical=$critical recreate=$recreate ..."
 $Master/tlpkg/bin/tl-update-containers $gpgcmd \
   $verbose -location $tltry $critical $recreate
@@ -101,11 +101,11 @@
 # It is scary, but I guess we should update the installer package every
 # day, partly for the sake of doc.html and partly so it actually gets
 # tested.  Hopefully we don't break the Perl modules very often.
-echo "$0: Running tl-update-install-pkg..."
+echo "$0: Running tl-update-install-pkg (also from $Master)..."
 $Master/tlpkg/bin/tl-update-install-pkg $gpgcmd -o $tltry
 END_COW
 
-# cow-shell leaves this around.
+# cow-shell might leave this around.
 rm -f $tltry/.ilist
 
 # if not doing the test installation, don't push anything out.



More information about the tex-live-commits mailing list