summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-16 21:26:14 +0000
committerKarl Berry <karl@freefriends.org>2013-04-16 21:26:14 +0000
commit56ac0d1166f2da715fcd5603debbedd1a79652fc (patch)
treec08686cc637a5925813b54f80cbf2ae83cea2be1 /Build
parent4429bc396997d3324ceb2d4ca87247895646ddbc (diff)
pmx-2.7.0 (16apr13)
git-svn-id: svn://tug.org/texlive/trunk@29978 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/rungs.tlu2
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl20
2 files changed, 12 insertions, 10 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/rungs.tlu b/Build/source/texk/texlive/linked_scripts/texlive/rungs.tlu
index 7ac0587b397..277657731ec 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/rungs.tlu
+++ b/Build/source/texk/texlive/linked_scripts/texlive/rungs.tlu
@@ -1,6 +1,6 @@
#!/usr/bin/env texlua
--*-Lua-*-
--- $Id: rungs.tlu 7698 2008-04-28 14:23:31Z reinhardk $
+-- $Id: rungs.tlu 29719 2013-04-07 18:42:53Z karl $
-- Copyright (C) 2008 Reinhard Kotucha.
-- You may freely use, modify and/or distribute this file.
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index b05e08b4f1b..dd0e31a4471 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 29921 2013-04-14 23:54:53Z karl $
+# $Id: tlmgr.pl 29950 2013-04-15 17:35:00Z karl $
#
# Copyright 2008-2013 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 29921 $';
-my $datrev = '$Date: 2013-04-15 01:54:53 +0200 (Mon, 15 Apr 2013) $';
+my $svnrev = '$Revision: 29950 $';
+my $datrev = '$Date: 2013-04-15 19:35:00 +0200 (Mon, 15 Apr 2013) $';
my $tlmgrrevision;
my $prg;
if ($svnrev =~ m/: ([0-9]+) /) {
@@ -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.)");
}
}