summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-04 17:53:27 +0000
committerKarl Berry <karl@freefriends.org>2018-05-04 17:53:27 +0000
commitdae6dae132662766819bf8fd71f52cc3e650968a (patch)
tree08bb026f7cb34569d4b5afdfa31aa22db35cfa66
parentdcb5354d471c610f8b89d3d5f1af7d1caf03f0c0 (diff)
update 00texlive.{installer,image} in tlnet; report from texlive@schoepfer.info, 03 May 2018 18:49:46
git-svn-id: svn://tug.org/texlive/trunk@47611 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/tlpkg/bin/tl-update-containers44
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlnet6
2 files changed, 30 insertions, 20 deletions
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index a1b0c36421f..204540c6aff 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -44,7 +44,7 @@ my $opt_nosign = 0;
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 @@ GetOptions(
"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 @@ sub main {
# 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 @@ sub main {
$::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 @@ sub main {
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 @@ sub main {
}
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 @@ tl-update-containers [I<option>]...
=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 @@ of containers to be compared against; default is C<./archive>.
=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 @@ Do not create any relocatable packages.
=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 @@ pseudo-package C<00texlive.config>. See L<TeXLive::TLPDB>.
=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
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index 3cc8bd7915d..2da47874b5a 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -93,7 +93,7 @@ done
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 @@ $Master/tlpkg/bin/tl-update-containers $gpgcmd \
# 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.