wording of major version mismatch error

git-svn-id: svn://tug.org/texlive/trunk@19759 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 12 insertions, 4 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 3ab7cfe60f4..2dc53915400 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -459,19 +459,27 @@ if (($media eq "NET") || ($media eq "CD")) {
 }
 $texlive_release = $tlpdb->config_release;
 if ($media eq "DVD") {
-  # existing installation will not have 00texlive.config metapackage
+  # existing installation may not have 00texlive.config metapackage
   # so use TLConfig to establish what release we have
   $texlive_release ||= $TeXLive::TLConfig::ReleaseYear;
 }
+
 # if the release from the remote TLPDB does not agree with the
 # TLConfig::ReleaseYear in the first 4 places break out here.
 # Why only the first four places: some optional network distributions
 # might use
 #   release/2009-foobar
-if ($media eq "NET" &&
-    $texlive_release !~ m/^$TeXLive::TLConfig::ReleaseYear/) {
-  die "The release version of the installation source and\nthe installation media do not agree:\nsource: $texlive_release\nmedia: $TeXLive::TLConfig::ReleaseYear\nPlease report to tex-live\@tug.org";
+if ($media eq "NET"
+    && $texlive_release !~ m/^$TeXLive::TLConfig::ReleaseYear/) {
+  die <<END_MISMATCH;
+$0: The TeX Live versions of the local installation
+and the repository being accessed are not compatible:
+      local: $TeXLive::TLConfig::ReleaseYear
+ repository: $texlive_release
+Perhaps you need to use a different CTAN mirror?
+END_MISMATCH
 }
+
 set_platforms_supported();
 set_texlive_default_dirs();
 set_install_platform();