summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2015-11-28 02:15:58 +0000
committerNorbert Preining <preining@logic.at>2015-11-28 02:15:58 +0000
commit5f51f01fa7eb1f9279f17145eef48e114f34e097 (patch)
tree5855dea4f0ee94826b893ddd143ab175404e7a71 /Master
parentc44cc5bdbd852739631251c53d3119bc006172d3 (diff)
rename triggers to fmttriggers
git-svn-id: svn://tug.org/texlive/trunk@38967 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl4
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm7
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