diff options
author | Karl Berry <karl@freefriends.org> | 2009-06-11 21:20:56 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-06-11 21:20:56 +0000 |
commit | e220027be929e82db77e5e4afd5f4b8329250bad (patch) | |
tree | 91198362fbcb0655a2ea7e9e3faa9d69d5d454c6 /Build | |
parent | a1b7fde47b1bb5e8bb795bfa0774e7f8889dfcf4 (diff) |
do not consider the five-year-warning an error, from Norbert; Debian bug 531595
git-svn-id: svn://tug.org/texlive/trunk@13713 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/texk/tetex/ChangeLog | 6 | ||||
-rwxr-xr-x | Build/source/texk/tetex/fmtutil | 53 |
2 files changed, 55 insertions, 4 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog index 4ad6a98cc77..2dac9a7ba43 100644 --- a/Build/source/texk/tetex/ChangeLog +++ b/Build/source/texk/tetex/ChangeLog @@ -1,3 +1,9 @@ +2009-06-11 Norbert Preining <preining@logic.at> + + * fmtutil (log_warning): new fn, related code, so that + LaTeX's five-year-old warning does not trigger failure. + Debian bug #531595. + 2009-05-28 Karl Berry <karl@tug.org> * texconfig.man: update from Frank K, 27 May 2009 23:17:49. diff --git a/Build/source/texk/tetex/fmtutil b/Build/source/texk/tetex/fmtutil index a2d3808b988..2a76d08f558 100755 --- a/Build/source/texk/tetex/fmtutil +++ b/Build/source/texk/tetex/fmtutil @@ -84,8 +84,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version=1205513038 # seconds since `00:00:00 1970-01-01 UTC' - # date '+%s' (with GNU date) +version=20090611.2319 cnf=fmtutil.cnf # name of the config file export PATH @@ -259,6 +258,23 @@ verboseMsg() { ############################################################################### byebye() { + if $has_warnings; then + { + cat <<eof + +############################################################################### +$progname: Warning! Some warnings have been issued. +Visit the log files in directory + $destdir +for details. +############################################################################### + +This is a summary of all \`warning' messages: +$log_warning_msg +eof + } >&2 + fi + if $has_errors; then { cat <<eof @@ -270,7 +286,7 @@ Visit the log files in directory for details. ############################################################################### -This is a summary of all \`failed' messages and warnings: +This is a summary of all \`failed' messages: $log_failure_msg eof } >&2 @@ -281,6 +297,16 @@ eof } ############################################################################### +# init_log_warning() +# reset the list of warning messages +############################################################################### +init_log_warning() +{ + log_warning_msg= + has_warnings=false +} + +############################################################################### # init_log_failure() # reset the list of failure messages ############################################################################### @@ -291,6 +317,24 @@ init_log_failure() } ############################################################################### +# log_warning(errmsg) +# report and save warning message `errmsg' +############################################################################### +log_warning() +{ + echo "Warning: $@" >&2 + if test -z "$log_warning_msg"; then + log_warning_msg="$@" + else + OLDIFS=$IFS; IFS= + log_warning_msg="$log_warning_msg +$@" + IFS=$OLDIFS + fi + has_warnings=true +} + +############################################################################### # log_failure(errmsg) # report and save failure message `errmsg' ############################################################################### @@ -547,6 +591,7 @@ main() cache_vars init_log_failure + init_log_warning # execute the desired command: case "$cmd" in all) @@ -706,7 +751,7 @@ run_initex() mkdir -p "$fulldestdir" if test -f $fmtfile; then grep '^! ' $format.log >/dev/null 2>&1 && - log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed." + log_warning "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed." # We don't want user-interaction for the following "mv" commands: mv "$format.log" "$fulldestdir/$format.log" </dev/null |