diff options
author | Karl Berry <karl@freefriends.org> | 2017-11-03 17:55:12 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-11-03 17:55:12 +0000 |
commit | 976dd4b4e298f349b6f4b37b0b4be9a66f60c1c6 (patch) | |
tree | c7b0940efa5b058f95e4fb7437cbbc86770e26ea /Master/tlpkg/bin | |
parent | c20b97f58a14f13e6d1a2fcc87ec505aaf3fce27 (diff) |
packages need not list themselves as fmttriggers; check this (from texlive@schoepfer.info, 6 Oct 2017 23:22:57)
git-svn-id: svn://tug.org/texlive/trunk@45678 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/bin')
-rwxr-xr-x | Master/tlpkg/bin/check-fmttriggers | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Master/tlpkg/bin/check-fmttriggers b/Master/tlpkg/bin/check-fmttriggers index 3939fd1bc67..7d8b85b8c3c 100755 --- a/Master/tlpkg/bin/check-fmttriggers +++ b/Master/tlpkg/bin/check-fmttriggers @@ -273,7 +273,7 @@ sub pkgs_per_format { # Compare lists of packages required by building (PKGS_PER_FORMAT) with -# lists of existing trigger directives (FMTTRIGGER). Return 0 if +# lists of existing trigger directives (FMTTRIGGERS). Return 0 if # identical, 1 otherwise (and report differences). Ignore hyphenation # dependencies and the package itself containing the trigger directive # (FMTPKGCONTAINERS). @@ -299,15 +299,21 @@ sub compare_pkgs_and_triggers { my @tlpdb_pkgs = @{$fmttriggers->{$ef}}; my %tlpdb_pkgs; @tlpdb_pkgs{@tlpdb_pkgs} = (); # hash slice for tlpdb pkgs - + my @recorded_only = (); for my $r (keys %recorded_pkgs) { + # no need for a package to include itself as a fmttrigger. + next if $r eq $fmtpkgcontainers->{$ef}; + if (exists $tlpdb_pkgs{$r}) { delete $tlpdb_pkgs{$r}; # ok, in both } else { + # sometimes we like to include the hyphenation packages as + # 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 $r =~ /hyphen-.*/; - next if $r eq $fmtpkgcontainers->{$ef}; push (@recorded_only, $r); } } |