diff options
Diffstat (limited to 'Master')
| -rwxr-xr-x | Master/texmf-dist/scripts/texlive/tlmgr.pl | 4 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index dfe36bfcd58..5210c0a3337 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -3441,8 +3441,8 @@ sub check_announce_format_triggers { FMTDEF: for my $fmtdef ($localtlpdb->format_definitions) { # if by default they are activated, check the whether the # trigger packages appear in the list of updated/new packages - if (($fmtdef->{'mode'} == 1) && $fmtdef->{'triggers'}) { - for my $trigger (@{$fmtdef->{'triggers'}}) { + if (($fmtdef->{'mode'} == 1) && $fmtdef->{'fmttriggers'}) { + for my $trigger (@{$fmtdef->{'fmttriggers'}}) { if ($updpacks{$trigger}) { TeXLive::TLUtils::announce_execute_actions("rebuild-format", 0, $fmtdef); diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 6fa0736ac53..af6a1b908bb 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -116,7 +116,6 @@ use vars qw( $::LOGFILENAME @::LOGLINES @::debug_hook @::ddebug_hook @::dddebug_hook @::info_hook @::warn_hook @::install_packages_hook - @::fmt_triggers $::machinereadable $::no_execute_actions $::regenerate_all_formats @@ -3069,7 +3068,7 @@ sub parse_AddFormat_line { $ret{"mode"} = 1; for my $p (quotewords('\s+', 0, "$line")) { my ($a, $b); - if ($p =~ m/^(name|engine|mode|patterns|options|triggers)=(.*)$/) { + if ($p =~ m/^(name|engine|mode|patterns|options|fmttriggers)=(.*)$/) { $a = $1; $b = $2; } else { @@ -3104,9 +3103,9 @@ sub parse_AddFormat_line { $ret{"options"} = ( $b ? $b : "" ); next; } - if ($a eq "triggers") { + if ($a eq "fmttriggers") { my @tl = split(',',$b); - $ret{"triggers"} = \@tl ; + $ret{"fmttriggers"} = \@tl ; next; } # should not be reached at all |