diff options
author | Karl Berry <karl@freefriends.org> | 2013-04-15 17:35:00 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-04-15 17:35:00 +0000 |
commit | dc1072656f094a310e2e304313e3ca40ad656de2 (patch) | |
tree | 5b8c55615215364b44bea81bcc67a730f2a8540b /Master | |
parent | ff8fb5a6961297cb95923800f6b85fc8a8b70f50 (diff) |
report repository in some msgs
git-svn-id: svn://tug.org/texlive/trunk@29950 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-x | Master/texmf-dist/scripts/texlive/tlmgr.pl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index 85b475d08e4..4960d4fd124 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -5516,15 +5516,16 @@ END_NO_INTERNET # release/2010-foobar my $texlive_release = $remotetlpdb->config_release; my $texlive_minrelease = $remotetlpdb->config_minrelease; + my $rroot = $remotetlpdb->root; if (!defined($texlive_release)) { - return(undef, "The installation repository does not specify a " + return(undef, "The installation repository ($rroot) does not specify a " . "release year for which it was prepared, goodbye."); } # still here, so we have $texlive_release defined my $texlive_release_year = $texlive_release; $texlive_release_year =~ s/^(....).*$/$1/; if ($texlive_release_year !~ m/^[1-9][0-9][0-9][0-9]$/) { - return(undef, "The installation repository does not specify a " + return(undef, "The installation repository ($rroot) does not specify a " . "valid release year, goodbye: $texlive_release"); } # so $texlive_release_year is numeric, good @@ -5533,13 +5534,14 @@ END_NO_INTERNET my $texlive_minrelease_year = $texlive_minrelease; $texlive_minrelease_year =~ s/^(....).*$/$1/; if ($texlive_minrelease_year !~ m/^[1-9][0-9][0-9][0-9]$/) { - return(undef, "The installation repository does not specify a " + return(undef, "The installation repository ($rroot) does not specify a " . "valid minimal release year, goodbye: $texlive_minrelease"); } # ok, all numeric and fine, check for range if ($TeXLive::TLConfig::ReleaseYear < $texlive_minrelease_year || $TeXLive::TLConfig::ReleaseYear > $texlive_release_year) { return (undef, "The TeX Live versions supported by the repository +$rroot ($texlive_minrelease_year--$texlive_release_year) do not include the version of the local installation ($TeXLive::TLConfig::ReleaseYear)."); @@ -5548,10 +5550,10 @@ do not include the version of the local installation # $texlive_minrelease not defined, so only one year is valid if ($texlive_release_year != $TeXLive::TLConfig::ReleaseYear) { return(undef, "The TeX Live versions of the local installation -and the repository being accessed are not compatible: +and the repository are not compatible: local: $TeXLive::TLConfig::ReleaseYear - repository: $texlive_release_year -(Perhaps you need to use a different CTAN mirror?)."); + repository: $texlive_release_year ($rroot) +(Perhaps you need to use a different CTAN mirror? Just a guess.)"); } } |