From d630c50b6148684fc56310f98e811c7f4959a32c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 21 Feb 2021 23:18:27 +0000 Subject: (compare_pkgs_and_triggers): exclude atbegshi etc. from tlpdb-only report, but keep them for recorded check. git-svn-id: svn://tug.org/texlive/trunk@57837 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/tl-check-fmttriggers | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'Master') diff --git a/Master/tlpkg/bin/tl-check-fmttriggers b/Master/tlpkg/bin/tl-check-fmttriggers index 31868bfcd24..724f468b33a 100755 --- a/Master/tlpkg/bin/tl-check-fmttriggers +++ b/Master/tlpkg/bin/tl-check-fmttriggers @@ -300,7 +300,8 @@ sub compare_pkgs_and_triggers { # we don't include these as fmttriggers since when they meaningfully # change, fmtutil should get called anyway due to language.* changing. - my @skip_pkgs = qw(dehyph-exptl ruhyphen ukrhyph); + my @skip_recorded = qw(dehyph-exptl ruhyphen ukrhyph); + # Anything matching hyphen-.* is also ignored, but not hyph-utf8. for my $ef (sort keys %$pkgs_per_format) { @@ -324,15 +325,6 @@ sub compare_pkgs_and_triggers { # 00texlive.autopatterns.tlpsrc. delete $tlpdb_pkgs{"l3backend"}; - # These packages are also included as fmttriggers eventhough they - # are not necessary, to simplify maintenance of the package lists. - delete $tlpdb_pkgs{"atbegshi"}; - delete $tlpdb_pkgs{"atveryend"}; - delete $tlpdb_pkgs{"everyshi"}; - delete $tlpdb_pkgs{"latex"}; - delete $tlpdb_pkgs{"tex-ini-files"}; - delete $tlpdb_pkgs{"unicode-data"}; - my @recorded_only = (); for my $r (keys %recorded_pkgs) { # no need for a package to include itself as a fmttrigger. @@ -345,14 +337,23 @@ sub compare_pkgs_and_triggers { # triggers in the tlpdb, for no particular reason. Let that be # ok, and only check for the skipped packages when making the # trigger list for an engine.format not in tlpdb. - next if grep ($_ eq $r, @skip_pkgs); + next if grep ($_ eq $r, @skip_recorded); next if $r =~ /hyphen-.*/; push (@recorded_only, $r); } } if (keys %tlpdb_pkgs) { + # These packages are also included as fmttriggers even though + # they are not always necessary, to simplify maintenance of the + # package lists. So don't worry about them if they are present. + my @skip_tlpdb = qw(atbegshi atveryend everyshi latex + tex-ini-files unicode-data); + my %skip_tlpdb; @skip_tlpdb{@skip_tlpdb} = 1; # make into hash + tlwarn ("$prg: $ef triggers only in tlpdb: " - . join (",", sort keys %tlpdb_pkgs) . "\n"); + . join (",", sort + grep { ! exists $skip_tlpdb{$_} } keys %tlpdb_pkgs) + . "\n"); $bad_p = 1; } if (@recorded_only) { -- cgit v1.2.3