From 8617ee441f4f0151a85352381b6b7b10ec91af43 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 10 Nov 2012 00:50:20 +0000 Subject: sync git-svn-id: svn://tug.org/texlive/trunk@28224 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/tests/TeXLive/TLUtils.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm index f76b3328f63..6787e2fbc45 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: 27249 $'; +my $svnrev = '$Revision: 27741 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -2691,8 +2691,12 @@ sub check_for_old_updmap_cfg { return unless -r $oldupd; # if no such file, good. open (OLDUPD, "<$oldupd") || die "open($oldupd) failed: $!"; - chomp( my $firstline = ); + my $firstline = ; close(OLDUPD); + # cygwin returns undef when reading from an empty file, we have + # to make sure that this is anyway initialized + $firstline = "" if (!defined($firstline)); + chomp ($firstline); # if ($firstline =~ m/^# Generated by (install-tl|.*\/tlmgr) on/) { # assume it was our doing, rename it. -- cgit v1.2.3