diff options
Diffstat (limited to 'Build')
| -rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 418f2218788..bbb89c01c62 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,12 +1,12 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 54001 2020-03-02 17:58:52Z karl $ +# $Id: tlmgr.pl 54087 2020-03-05 00:48:55Z preining $ # # Copyright 2008-2020 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 54001 $'; -my $datrev = '$Date: 2020-03-02 18:58:52 +0100 (Mon, 02 Mar 2020) $'; +my $svnrev = '$Revision: 54087 $'; +my $datrev = '$Date: 2020-03-05 01:48:55 +0100 (Thu, 05 Mar 2020) $'; my $tlmgrrevision; my $tlmgrversion; my $prg; @@ -7081,6 +7081,11 @@ END_NO_INTERNET # If it should work for 2009 and 2010, please use # minrelease/2009-foobar # release/2010-foobar + # One exception: if there *is* an extension like -foobar (-gpg, ..) + # we allow the local release to be smaller than the max, + # so that additional repos can do + # release/3000-foobar + # and be usable with all future releases, too. my $texlive_release = $remotetlpdb->config_release; my $texlive_minrelease = $remotetlpdb->config_minrelease; my $rroot = $remotetlpdb->root; @@ -7121,13 +7126,18 @@ do not include the version of the local installation # if the release of the installed TL is less than the release # of the main remote repository, then # warn that one needs to call update-tlmgr-latest.sh --update + # We do this only if there is no extension like 2100-gpg etc if ($is_main && $TeXLive::TLConfig::ReleaseYear < $texlive_release_year) { - info("fail load $location\n") if ($::machinereadable); - return (undef, "Local TeX Live ($TeXLive::TLConfig::ReleaseYear)" - . " is older than remote repository ($texlive_release_year).\n" - . "Cross release updates are only supported with\n" - . " update-tlmgr-latest(.sh/.exe) --update\n" - . "See https://tug.org/texlive/upgrade.html for details.") + if (length($texlive_release) > 4) { + debug("Accepting a newer release as remote due to presence of release extension!\n"); + } else { + info("fail load $location\n") if ($::machinereadable); + return (undef, "Local TeX Live ($TeXLive::TLConfig::ReleaseYear)" + . " is older than remote repository ($texlive_release_year).\n" + . "Cross release updates are only supported with\n" + . " update-tlmgr-latest(.sh/.exe) --update\n" + . "See https://tug.org/texlive/upgrade.html for details.") + } } } else { # $texlive_minrelease not defined, so only one year is valid @@ -10001,7 +10011,7 @@ This script and its documentation were written for the TeX Live distribution (L<https://tug.org/texlive>) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 54001 2020-03-02 17:58:52Z karl $ +$Id: tlmgr.pl 54087 2020-03-05 00:48:55Z preining $ =cut # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html |