From 459e82019ab78f401ed59ff60cc9733626c72be4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 2 Aug 2012 00:14:21 +0000 Subject: consistency git-svn-id: svn://tug.org/texlive/trunk@27276 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/tests/TeXLive/TLUtils.pm | 17 ++++++++++------- .../source/texk/texlive/linked_scripts/texlive/tlmgr.pl | 8 ++++---- Build/source/utils/biber/TeXLive/TLUtils.pm | 17 ++++++++++------- 3 files changed, 24 insertions(+), 18 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm index 5b9a6355623..f76b3328f63 100644 --- a/Build/source/texk/tests/TeXLive/TLUtils.pm +++ b/Build/source/texk/tests/TeXLive/TLUtils.pm @@ -5,7 +5,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 27031 $'; +my $svnrev = '$Revision: 27249 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -2723,12 +2723,15 @@ See the documentation for updmap. } } else { # first line did not match - print STDERR "Apparently - $oldupd -was created by hand. This config file should not be used anymore, -so please do what's necessary to eliminate it. -See the documentation for updmap. -"; + # that is NOT a good idea, because updmap creates updmap.cfg in + # TEXMFSYSCONFIG when called with --enable Map etc, so we should + # NOT warn here + # print STDERR "Apparently +# $oldupd +# was created by hand. This config file should not be used anymore, +# so please do what's necessary to eliminate it. +# See the documentation for updmap. +# "; } } diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index f8ad8833a0b..adfb3b3165a 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 27170 2012-07-26 22:38:00Z karl $ +# $Id: tlmgr.pl 27258 2012-07-30 22:52:04Z karl $ # # Copyright 2008, 2009, 2010, 2011, 2012 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 27170 $'; -my $datrev = '$Date: 2012-07-27 00:38:00 +0200 (Fri, 27 Jul 2012) $'; +my $svnrev = '$Revision: 27258 $'; +my $datrev = '$Date: 2012-07-31 00:52:04 +0200 (Tue, 31 Jul 2012) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -5706,7 +5706,7 @@ different file for the log. =item B<--pause> This option makes C wait for user input before exiting. Useful on -Windows to avoid command windows disappearing. +Windows to avoid disappearing command windows. =item B<--persistent-downloads> diff --git a/Build/source/utils/biber/TeXLive/TLUtils.pm b/Build/source/utils/biber/TeXLive/TLUtils.pm index 5b9a6355623..f76b3328f63 100644 --- a/Build/source/utils/biber/TeXLive/TLUtils.pm +++ b/Build/source/utils/biber/TeXLive/TLUtils.pm @@ -5,7 +5,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 27031 $'; +my $svnrev = '$Revision: 27249 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -2723,12 +2723,15 @@ See the documentation for updmap. } } else { # first line did not match - print STDERR "Apparently - $oldupd -was created by hand. This config file should not be used anymore, -so please do what's necessary to eliminate it. -See the documentation for updmap. -"; + # that is NOT a good idea, because updmap creates updmap.cfg in + # TEXMFSYSCONFIG when called with --enable Map etc, so we should + # NOT warn here + # print STDERR "Apparently +# $oldupd +# was created by hand. This config file should not be used anymore, +# so please do what's necessary to eliminate it. +# See the documentation for updmap. +# "; } } -- cgit v1.2.3