diff options
| author | Karl Berry <karl@freefriends.org> | 2012-11-10 00:50:20 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2012-11-10 00:50:20 +0000 |
| commit | 8617ee441f4f0151a85352381b6b7b10ec91af43 (patch) | |
| tree | 8866f595e71d4f60502f7d6ba619af1a310892e2 /Build/source | |
| parent | dac8ad1dbd161de074cb5912677006e5455e8296 (diff) | |
sync
git-svn-id: svn://tug.org/texlive/trunk@28224 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
| -rw-r--r-- | Build/source/texk/tests/TeXLive/TLUtils.pm | 8 | ||||
| -rw-r--r-- | Build/source/utils/biber/TeXLive/TLUtils.pm | 8 |
2 files changed, 12 insertions, 4 deletions
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 = <OLDUPD> ); + my $firstline = <OLDUPD>; 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. diff --git a/Build/source/utils/biber/TeXLive/TLUtils.pm b/Build/source/utils/biber/TeXLive/TLUtils.pm index f76b3328f63..6787e2fbc45 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: 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 = <OLDUPD> ); + my $firstline = <OLDUPD>; 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. |