summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2017-11-21 07:07:36 +0000
committerNorbert Preining <preining@logic.at>2017-11-21 07:07:36 +0000
commit1d432b6cf721927af3d7121d1d38e2f7bda7a905 (patch)
tree602d27fdaeb83d78c00e6c01ed5927c0e63c1ade /Master/texmf-dist
parent045a2c0fc62e6ff1047f6fd6f8261f26a1dfba3e (diff)
fmtutil missing/refresh part 2: move name computation to parent function
git-svn-id: svn://tug.org/texlive/trunk@45871 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/fmtutil.pl9
1 files changed, 5 insertions, 4 deletions
diff --git a/Master/texmf-dist/scripts/texlive/fmtutil.pl b/Master/texmf-dist/scripts/texlive/fmtutil.pl
index 259045c8518..293208c1ef2 100755
--- a/Master/texmf-dist/scripts/texlive/fmtutil.pl
+++ b/Master/texmf-dist/scripts/texlive/fmtutil.pl
@@ -467,6 +467,9 @@ sub select_and_rebuild_format {
my ($fmt, $eng, $what, $whatarg) = @_;
return $FMT_DISABLED
if ($alldata->{'merged'}{$fmt}{$eng}{'status'} eq 'disabled');
+
+ my ($kpsefmt, $destdir, $fmtfile, $logfile) = compute_format_destination($fmt, $eng);
+
my $doit = 0;
# we just identify 'all', 'refresh', 'missing'
# I don't see much point in keeping all of them
@@ -510,7 +513,7 @@ sub select_and_rebuild_format {
}
}
if ($doit) {
- return rebuild_one_format($fmt,$eng);
+ return rebuild_one_format($fmt, $eng, $kpsefmt, $destdir, $fmtfile, $logfile);
} else {
return $FMT_NOTSELECTED;
}
@@ -555,7 +558,7 @@ sub compute_format_destination {
# return value FMT_*
#
sub rebuild_one_format {
- my ($fmt, $eng) = @_;
+ my ($fmt, $eng, $kpsefmt, $destdir, $fmtfile, $logfile) = @_;
print_info("--- remaking $fmt with $eng\n");
# get variables
@@ -572,8 +575,6 @@ sub rebuild_one_format {
my $localpool=0;
my $texargs;
- my ($kpsefmt, $destdir, $fmtfile, $logfile) = compute_format_destination($fmt, $eng);
-
unlink glob "*.pool";
# addargs processing: