From 98da14d35616fd1762dbeeb32c51cbff25b52a68 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 18 Mar 2022 22:22:23 +0000 Subject: sync git-svn-id: svn://tug.org/texlive/trunk@62796 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/tests/TeXLive/TLUtils.pm | 37 +++++++++++++----------- Build/source/texk/texlive/tl_support/fmtutil.cnf | 8 +++-- 2 files changed, 26 insertions(+), 19 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm index ad5d3033af6..478fbd7c264 100644 --- a/Build/source/texk/tests/TeXLive/TLUtils.pm +++ b/Build/source/texk/tests/TeXLive/TLUtils.pm @@ -7,7 +7,7 @@ use strict; use warnings; package TeXLive::TLUtils; -my $svnrev = '$Revision: 62431 $'; +my $svnrev = '$Revision: 62529 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -259,7 +259,7 @@ BEGIN { @EXPORT = qw(setup_programs download_file process_logging_options tldie tlwarn info log debug ddebug dddebug debug debug_hash_str debug_hash - win32 xchdir xsystem run_cmd system_pipe diskfree sort_archs); + win32 xchdir xsystem run_cmd system_pipe sort_archs); } use Cwd; @@ -737,8 +737,9 @@ sub xsystem { Run shell command C<$cmd> and captures its output. Returns a list with CMD's output as the first element and the return value (exit code) as second. -The C<@envvars> - if given - are variable name / value pairs set for the call -and reset to their original value (or unset if not defined initially). +If given, C<@envvars> is a list of environment variable name / value +pairs set in C<%ENV> for the call and reset to their original value (or +unset if not defined initially). =cut @@ -804,10 +805,10 @@ sub system_pipe { =item C -If a POSIX compliant C program is found, returns the number of -Mb free at C<$path>, otherwise C<-1>. If C<$path> is not existent, go -back up to two levels and check if any of the parents exists, and use -the existing one for computing the disk space. +If a POSIX compliant C program is found, returns the number of Mb +free at C<$path>, otherwise C<-1>. If C<$path> does not exist, check +upwards for two levels for an existing parent, and if found, use it for +computing the disk space. =cut @@ -838,9 +839,9 @@ sub diskfree { my ($h,$l) = split(/\n/, $output); my ($fs, $nrb, $used, $avail, @rest) = split(' ', $l); debug("disk space: used=$used (512-block), avail=$avail (512-block)\n"); - # $avail is in 512 blocks, so we need to device by 2 * 1024 to obtain Mb - # require that at least 100M remain free - return (int($avail / 2024)); + # $avail is in 512-byte blocks, so we need to divide by 2*1024 to + # obtain Mb. Require that at least 100M remain free. + return (int($avail / 2048)); } else { # error in running df -P out of whatever reason return (-1); @@ -1643,27 +1644,29 @@ sub time_estimate { return($remtime, $tottime); } - + =item C Installs the list of packages found in C<@$what> (a ref to a list) into the TLPDB given by C<$to_tlpdb>. Information on files are taken from the TLPDB C<$from_tlpdb>. -C<$opt_src> and C<$opt_doc> specify whether srcfiles and docfiles should be -installed (currently implemented only for installation from uncompressed media). +C<$opt_src> and C<$opt_doc> specify whether srcfiles and docfiles should +be installed (currently implemented only for installation from +uncompressed media). If C<$retry> is trueish, retry failed packages a second time. If C<$continue> is trueish, installation failure of non-critical packages -will be ignored. +will be ignored (success is returned). Returns 1 on success and 0 on error. =cut sub install_packages { - my ($fromtlpdb,$media,$totlpdb,$what,$opt_src,$opt_doc, $opt_retry, $opt_continue) = @_; + my ($fromtlpdb,$media,$totlpdb,$what, + $opt_src,$opt_doc,$opt_retry,$opt_continue) = @_; my $container_src_split = $fromtlpdb->config_src_container; my $container_doc_split = $fromtlpdb->config_doc_container; my $root = $fromtlpdb->root; @@ -1742,7 +1745,7 @@ sub install_packages { if (!$fromtlpdb->install_package($package, $totlpdb)) { if ($opt_continue) { push @::installation_failed_packages, $package; - tlwarn("Failed to install $package, but continue anyway!\n"); + tlwarn("Failed to install $package, but continuing anyway!\n"); } else { return 0; } diff --git a/Build/source/texk/texlive/tl_support/fmtutil.cnf b/Build/source/texk/texlive/tl_support/fmtutil.cnf index 14083c60197..78e2f8dfefc 100644 --- a/Build/source/texk/texlive/tl_support/fmtutil.cnf +++ b/Build/source/texk/texlive/tl_support/fmtutil.cnf @@ -1,4 +1,4 @@ -# Generated by /home/texlive/karl/Master/bin/x86_64-linux/tlmgr on Sat Oct 3 02:49:47 2020 +# Generated by /home/texlive/karl/Master/bin/x86_64-linux/tlmgr on Sun Mar 13 01:49:39 2022 # Originally written by Thomas Esser, 1998. Public domain. # # For guidance on how to support local formats, see the man @@ -68,6 +68,10 @@ pdfcsplain xetex - -etex csplain.ini # from eplain: eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini # +# from hitex: +hilatex hitex language.dat -etex -ltx hilatex.ini +hitex hitex language.def -etex -ltx hitex.ini +# # from jadetex: jadetex pdftex language.dat *jadetex.ini pdfjadetex pdftex language.dat *pdfjadetex.ini @@ -117,7 +121,7 @@ mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex # # from optex: -optex luatex hyphen-lan.opm optex.ini +optex luatex - optex.ini # # from pdftex: etex pdftex language.def -translate-file=cp227.tcx *etex.ini -- cgit v1.2.3