[tex-common] 01/05: fmtutil calling convention updated, switch to --strict
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository tex-common.
commit 2ade9c4efa9b2f1783c60b09e2a2c09cdf0f1416
Author: Norbert Preining <preining@debian.org>
Date: Mon Feb 22 19:41:48 2016 +0900
fmtutil calling convention updated, switch to --strict
we now define a variable FMTUTIL which carries all default options
and use that instead of repeating the fmtutil --sys ...other options...
Furthermore, we add --strict to fmtutil calls to make sure we
error out when a format is not build.
---
debian/changelog | 6 ++++++
debian/postinst | 22 ++++++++++++++--------
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fc4273c..c4a229e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tex-common (6.05) unstable; urgency=medium
+
+ * fmtutil calling convention updated, switch to --strict
+
+ -- Norbert Preining <preining@debian.org> Mon, 22 Feb 2016 19:43:07 +0900
+
tex-common (6.04) unstable; urgency=medium
* set Multi-Arch: foreign
diff --git a/debian/postinst b/debian/postinst
index c3eaa41..be6f8e3 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -28,6 +28,12 @@ umask 022
# definitions of necessary trees
TEXMFSYSVARDIR=/var/lib/texmf
+# fmtutil program and common arguments
+# --sys we are running in fmtutil-sys mode
+# --strict error out if a format is not build
+# --no-error-... luajittex is not available on all archs
+FMTUTIL="fmtutil --sys --strict --no-error-if-no-engine=luajittex"
+
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
@@ -67,13 +73,13 @@ dhit_build_format ()
tempfile=$(mktemp -p /tmp fmtutil.XXXXXXXX)
printf "Building format(s) $*.\n\tThis may take some time... "
- if fmtutil-sys --no-error-if-no-engine=luajittex "$@" > $tempfile 2>&1 ; then
+ if $FMTUTIL "$@" > $tempfile 2>&1 ; then
rm -f $tempfile
echo "done."
else
exec >&2
echo
- echo "fmtutil-sys failed. Output has been stored in"
+ echo "fmtutil failed. Output has been stored in"
echo "$tempfile"
echo "Please include this file if you report a bug."
echo
@@ -210,7 +216,7 @@ run_fmtutil()
;;
esac
if [ "$do_it" = 0 ] ; then
- echo "texlive-base is not ready, skipping fmtutil-sys --all call" >&2
+ echo "texlive-base is not ready, skipping fmtutil --all call" >&2
else
dhit_build_format --all
fi
@@ -245,7 +251,7 @@ run_hyphen()
{
if dhit_texlive_binaries_configured; then
if which kpsewhich >/dev/null; then
- if which fmtutil-sys >/dev/null; then
+ if which fmtutil >/dev/null; then
# code from postinst.tex
v=$(kpsewhich -var-value TEXMFSYSVAR)
c=$(kpsewhich -var-value TEXMFSYSCONFIG)
@@ -254,13 +260,13 @@ run_hyphen()
export TEXMFVAR TEXMFCONFIG
tempfile=$(mktemp -p /tmp fmtutil.XXXXXXXX)
printf "Building latex-based formats --byhyphen $(kpsewhich language.dat).\n\tThis may take some time... "
- if fmtutil-sys --no-error-if-no-engine=luajittex --byhyphen "$(kpsewhich language.dat)" > $tempfile 2>&1 ; then
+ if $FMTUTIL --byhyphen "$(kpsewhich language.dat)" > $tempfile 2>&1 ; then
rm -f $tempfile
echo "done."
else
exec >&2
echo
- echo "fmtutil-sys failed. Output has been stored in"
+ echo "fmtutil failed. Output has been stored in"
echo "$tempfile"
echo "Please include this file if you report a bug."
echo
@@ -268,13 +274,13 @@ run_hyphen()
fi
tempfile=$(mktemp -p /tmp fmtutil.XXXXXXXX)
printf "Building e-tex based formats --byhyphen $(kpsewhich language.def).\n\tThis may take some time... "
- if fmtutil-sys --no-error-if-no-engine=luajittex --byhyphen "$(kpsewhich language.def)" > $tempfile 2>&1 ; then
+ if $FMTUTIL --byhyphen "$(kpsewhich language.def)" > $tempfile 2>&1 ; then
rm -f $tempfile
echo "done."
else
exec >&2
echo
- echo "fmtutil-sys failed. Output has been stored in"
+ echo "fmtutil failed. Output has been stored in"
echo "$tempfile"
echo "Please include this file if you report a bug."
echo
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/tex-common.git
Reply to: