summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-11-20 19:10:44 +0000
committerKarl Berry <karl@freefriends.org>2014-11-20 19:10:44 +0000
commit64cbf2c3780ecc2205e1bc5e510c13a69e39ab29 (patch)
tree6d4b4d1e27e0e6a2b019e444736eb615778ac7c1
parent06639a3f306fc1ca197aa71701c4d7920e98c1e1 (diff)
* tl-update-tlnet: new options --no-consistency and --scheme to allow for
faster testing. Doc fixes wrt new fmtutil. git-svn-id: svn://tug.org/texlive/trunk@35627 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/texlive/tl_scripts/ChangeLog4
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlnet14
2 files changed, 13 insertions, 5 deletions
diff --git a/Build/source/texk/texlive/tl_scripts/ChangeLog b/Build/source/texk/texlive/tl_scripts/ChangeLog
index 4c165e79d72..29d74589b72 100644
--- a/Build/source/texk/texlive/tl_scripts/ChangeLog
+++ b/Build/source/texk/texlive/tl_scripts/ChangeLog
@@ -1,5 +1,9 @@
2014-11-20 Karl Berry <karl@tug.org>
+ * fmtutil.sh: (init_log_warnings, log_warning): remove.
+ (main): change log_warning calls to log_failure.
+ (flush_msg_buffers, byebye): no warnings any more.
+
* fmtutil-sys.sh: doc fixes.
* updmap-sys.sh: prepend directory of executable to $PATH.
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index b4dfa482c03..07c97a4fa36 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -11,10 +11,12 @@ unset LS_COLORS
yyyy=2014
+check_consistency=check-tlnet-consistency
chicken=false
critical=
pretest=false
recreate=
+scheme=full
testinstall=true
tlweb=/home/ftp/texlive/tlnet
verbose=
@@ -24,9 +26,11 @@ while test $# -gt 0; do
--critical) critical=--all;;
--dry-run|-n) chicken=true;;
--master) shift; Master=$1;;
- --no-testinstall|-N) testinstall=false;; # and no updates; quit early.
+ --no-consistency) check_consistency=true;; # takes a long time.
+ --no-testinstall|-N) testinstall=false;; # and no updates; quit early.
--pretest) tlweb=/home/ftp/texlive/tlpretest;;
--recreate) recreate=--recreate;;
+ --scheme) shift; scheme=$1;;
--testlocation) shift; tltrybase=$1;;
-v|-vv|-vvv) verbose=$1;;
--help) echo "ustl. sorry."; exit 0;;
@@ -103,7 +107,7 @@ zcat $tltry/install-tl-unx.tar.gz | tar -xf -
cd install-tl-* # subdir is YYYYMMDD
# create TL install profile:
echo "# texlive-profile from $0
-selected_scheme scheme-full
+selected_scheme scheme-$scheme
TEXDIR $tltryinst/$yyyy
TEXDIRW $tltryinst/$yyyy
TEXMFSYSCONFIG $tltryinst/$yyyy/texmf-config
@@ -188,7 +192,7 @@ if test $failure = false; then
for cmd in \
"$tltryinst/$yyyy/bin/*/tlmgr --repository $tltry update --list" \
"$tltryinst/$yyyy/bin/*/updmap-sys -n" \
- "$Master/tlpkg/bin/check-tlnet-consistency --location=$tltry" \
+ "$Master/tlpkg/bin/$check_consistency --location=$tltry" \
"$Master/tlpkg/bin/tl-compare-tlpdbs $critical $tltry/tlpkg/texlive.tlpdb" \
; do
cmdname=`echo "$cmd" | awk '{print $1}'`
@@ -205,10 +209,10 @@ if test $failure = false; then
done
fi
-# Format creation check. Unfortunately we have never got exit codes right.
+# Format creation check, in case fmtutil's exit status wasn't right.
install_tl_log=$tltryinst/$yyyy/install-tl.log
-if grep -i '^fmtutil: Error' $install_tl_log >/dev/null; then
+if grep -i '^fmtutil.*: error' $install_tl_log >/dev/null; then
echo >&2
echo "$0: seems fmtutil failed, check $install_tl_log." >&2
failure=true