From dae6dae132662766819bf8fd71f52cc3e650968a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 4 May 2018 17:53:27 +0000 Subject: 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 --- Master/tlpkg/bin/tl-update-containers | 44 +++++++++++++++++++++-------------- Master/tlpkg/bin/tl-update-tlnet | 6 ++--- 2 files changed, 30 insertions(+), 20 deletions(-) (limited to 'Master') 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