From f51b9eece29763e976f693b98b6c267399235262 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 5 May 2015 22:32:32 +0000 Subject: sync git-svn-id: svn://tug.org/texlive/trunk@37215 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/tests/TeXLive/TLUtils.pm | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'Build/source/texk/tests/TeXLive') diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm index 7b116558671..8763d3dbf6a 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: 36787 $'; +my $svnrev = '$Revision: 36818 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -69,8 +69,8 @@ C -- utilities used in the TeX Live infrastructure TeXLive::TLUtils::make_var_skeleton($path); TeXLive::TLUtils::make_local_skeleton($path); - TeXLive::TLUtils::create_fmtutil($tlpdb,$dest,$localconf); - TeXLive::TLUtils::create_updmap($tlpdb,$dest,$localconf); + TeXLive::TLUtils::create_fmtutil($tlpdb,$dest); + TeXLive::TLUtils::create_updmap($tlpdb,$dest); TeXLive::TLUtils::create_language_dat($tlpdb,$dest,$localconf); TeXLive::TLUtils::create_language_def($tlpdb,$dest,$localconf); TeXLive::TLUtils::create_language_lua($tlpdb,$dest,$localconf); @@ -2763,9 +2763,9 @@ sub make_local_skeleton { } -=item C +=item C -=item C +=item C =item C @@ -2799,22 +2799,21 @@ sub get_disabled_local_configs { my $localconf = shift; my $cc = shift; my @disabled = (); - if (-r "$localconf") { - open FOO, "<$localconf" - or die "strange, -r ok but cannot open $localconf: $!"; + if ($localconf && -r $localconf) { + open (FOO, "<$localconf") + || die "strange, -r ok but open($localconf) failed: $!"; my @tmp = ; - close(FOO) || warn("Closing $localconf did not succeed: $!"); - @disabled = map { if (m/^$cc!(\S+)\s*$/) { $1 } else { }} @tmp; + close(FOO) || warn("close($localconf) failed: $!"); + @disabled = map { if (m/^$cc!(\S+)\s*$/) { $1 } else { } } @tmp; } return @disabled; } sub create_fmtutil { - my ($tlpdb,$dest,$localconf) = @_; - my @lines = $tlpdb->fmtutil_cnf_lines( - get_disabled_local_configs($localconf, '#')); + my ($tlpdb,$dest) = @_; + my @lines = $tlpdb->fmtutil_cnf_lines(); _create_config_files($tlpdb, "texmf-dist/web2c/fmtutil-hdr.cnf", $dest, - $localconf, 0, '#', \@lines); + undef, 0, '#', \@lines); } sub create_updmap { -- cgit v1.2.3