summaryrefslogtreecommitdiff
path: root/Master/texmf
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-09-20 00:40:00 +0000
committerKarl Berry <karl@freefriends.org>2010-09-20 00:40:00 +0000
commit9b5d6f42f0da990531f83640ca486c3bc6841823 (patch)
tree4c87e2d05af7ee0d2847569620a1aeff26c08e78 /Master/texmf
parent173d56275740c63511eecf1fad8a0f3164895176 (diff)
wording of some fatal msgs
git-svn-id: svn://tug.org/texlive/trunk@19818 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf')
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl23
1 files changed, 17 insertions, 6 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 52373b7c67a..665113c8b53 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -4337,22 +4337,33 @@ END_NO_INTERNET
tldie "The installation repository does not specify a valid maximal release year: $texlive_maxrelease, bailing out.\n";
}
# ok, all numeric and fine, check for range
- if ($TeXLive::TLConfig::ReleaseYear < $texlive_release_year ||
- $TeXLive::TLConfig::ReleaseYear > $texlive_maxrelease_year) {
- tldie "The supported release range as specified by the repository ($texlive_release_year - $texlive_maxrelease_year)\ndoes not match the release version of the installation ($TeXLive::TLConfig::ReleaseYear), bailing out.\n";
+ if ($TeXLive::TLConfig::ReleaseYear < $texlive_release_year
+ || $TeXLive::TLConfig::ReleaseYear > $texlive_maxrelease_year) {
+ tldie <<END_BADRANGE
+$0: The TeX Live versions supported by the repository
+ ($texlive_release_year--$texlive_maxrelease_year)
+do not include the version of the local installation
+ ($TeXLive::TLConfig::ReleaseYear). Goodbye.
+END_BADRANGE
}
} else {
# $texlive_maxrelease not defined, so only one year is valid
if ($texlive_release_year != $TeXLive::TLConfig::ReleaseYear) {
- tldie "The supported release as specified by the repository ($texlive_release_year)\ndoes not match the release version of the installation ($TeXLive::TLConfig::ReleaseYear), bailing out.\n";
+ tldie <<END_BADYEAR
+$0: The TeX Live versions of the local installation
+and the repository being accessed are not compatible:
+ local: $TeXLive::TLConfig::ReleaseYear
+ repository: $texlive_release_year
+(Perhaps you need to use a different CTAN mirror?) Goodbye.
+END_BADYEAR
}
}
# check for being frozen
if ($tlmediatlpdb->option("frozen")) {
my $frozen_msg = <<FROZEN;
-TeX Live $TeXLive::TLConfig::ReleaseYear is frozen and will not be
-updated anymore. This happens in preparation for a new release.
+TeX Live $TeXLive::TLConfig::ReleaseYear is frozen forever and will no
+longer be updated. This happens in preparation for a new release.
If you're interested in helping to pretest the new release (when
pretests are available), please read http://tug.org/texlive/pretest.html.