texlive[69980] U trunk/Master/tlpkg/tlpsrc: <manyformats>.tlpsrc:
commits+karl at tug.org
commits+karl at tug.org
Mon Feb 19 18:40:53 CET 2024
Revision: 69980
https://tug.org/svn/texlive?view=revision&revision=69980
Author: karl
Date: 2024-02-19 18:40:52 +0100 (Mon, 19 Feb 2024)
Log Message:
-----------
<manyformats>.tlpsrc: force-increment so the packages will be updated.
TLUtils.pm (report_tlpdb_differences): sort output.
tl-update-tlnet: use different log output filenames for the pretest and
trunk (`basename $tlweb`). Report success of each consistency check, for
clarity, and overall success/failure.
Explanation: updating autopatterns, as we did yesterday, does not
automatically update the affected packages, so the nightly build failed.
Specifically, tl-compare-tlpdbs failed with:
different packages from A to B:
uplatex
unknown differ fmttrigger
...
for each of the affected formats (eplain hitex jadetex latex-bin-dev
latex-bin mltex platex uplatex xelatex-dev xetex xmltex).
Modified Paths:
--------------
trunk/Master/tlpkg/TeXLive/TLUtils.pm
trunk/Master/tlpkg/bin/tl-update-tlnet
Property Changed:
----------------
trunk/Master/tlpkg/tlpsrc/eplain.tlpsrc
trunk/Master/tlpkg/tlpsrc/hitex.tlpsrc
trunk/Master/tlpkg/tlpsrc/jadetex.tlpsrc
trunk/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
trunk/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
trunk/Master/tlpkg/tlpsrc/mltex.tlpsrc
trunk/Master/tlpkg/tlpsrc/platex.tlpsrc
trunk/Master/tlpkg/tlpsrc/uplatex.tlpsrc
trunk/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc
trunk/Master/tlpkg/tlpsrc/xetex.tlpsrc
trunk/Master/tlpkg/tlpsrc/xmltex.tlpsrc
Modified: trunk/Master/tlpkg/TeXLive/TLUtils.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLUtils.pm 2024-02-19 10:19:44 UTC (rev 69979)
+++ trunk/Master/tlpkg/TeXLive/TLUtils.pm 2024-02-19 17:40:52 UTC (rev 69980)
@@ -4864,29 +4864,30 @@
if (defined($ret{'removed_packages'})) {
info ("removed packages from A to B:\n");
- for my $f (@{$ret{'removed_packages'}}) {
+ for my $f (sort @{$ret{'removed_packages'}}) {
info (" $f\n");
}
}
if (defined($ret{'added_packages'})) {
info ("added packages from A to B:\n");
- for my $f (@{$ret{'added_packages'}}) {
+ for my $f (sort @{$ret{'added_packages'}}) {
info (" $f\n");
}
}
if (defined($ret{'different_packages'})) {
info ("different packages from A to B:\n");
- for my $p (keys %{$ret{'different_packages'}}) {
+ for my $p (sort keys %{$ret{'different_packages'}}) {
info (" $p\n");
- for my $k (keys %{$ret{'different_packages'}->{$p}}) {
+ for my $k (sort keys %{$ret{'different_packages'}->{$p}}) {
if ($k eq "revision") {
info(" revision differ: $ret{'different_packages'}->{$p}->{$k}\n");
} elsif ($k eq "removed" || $k eq "added") {
info(" $k files:\n");
- for my $f (@{$ret{'different_packages'}->{$p}->{$k}}) {
+ for my $f (sort @{$ret{'different_packages'}->{$p}->{$k}}) {
info(" $f\n");
}
} else {
+ # e.g., fmttriggers; don't bother making a nice report.
info(" unknown differ $k\n");
}
}
Modified: trunk/Master/tlpkg/bin/tl-update-tlnet
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-tlnet 2024-02-19 10:19:44 UTC (rev 69979)
+++ trunk/Master/tlpkg/bin/tl-update-tlnet 2024-02-19 17:40:52 UTC (rev 69980)
@@ -267,6 +267,10 @@
echo "$prg: (end of unexpected output)." >&2
fi
+# This is so the output files from the branch consistency runs don't
+# overwrite the trunk consistency output files when we're doing the pretest.
+tlnet_target=`basename $tlweb` # tlnet or tlpretest
+
# more consistency checks.
if test $failure = false; then
for cmd in \
@@ -280,14 +284,17 @@
; do
cmdname=`echo "$cmd" | awk '{print $1}'`
if echo "$cmdname" | grep check-tlnet-consistency >/dev/null; then
- # skip consistency check if requested (for development only).
+ # skip consistency check if requested (for this script development only),
+ # since it takes quite a while.
$check_consistency || continue
fi
basecmd=`basename $cmdname`
echo "$prg: `date`"
echo "$prg: Running $basecmd ($cmd)"
- outfile=/tmp/tlnet.$basecmd
- if $cmd >$outfile 2>&1; then :; else
+ outfile=/tmp/$tlnet_target.$basecmd
+ if $cmd >$outfile 2>&1; then
+ echo "$prg: $basecmd ok."
+ else
echo "$prg: $basecmd failed ($cmd):" >&2
sed 8q $outfile >&2
echo "... see $outfile for full output ..." >&2
@@ -295,6 +302,7 @@
failure=true
fi
done
+ echo "$prg: `date` done with consistency checks (failure=$failure)"
fi
# Format creation check, in case fmtutil's exit status wasn't right.
@@ -322,6 +330,8 @@
echo "$prg: Copies of both are in /tmp." >&2
echo "$prg: Please rm -rf the trial dir." >&2
if $failure; then
+ echo
+ echo "$prg: Some failure, exiting."
exit 1
elif $chicken; then
echo
Index: trunk/Master/tlpkg/tlpsrc/eplain.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/eplain.tlpsrc 2024-02-19 10:19:44 UTC (rev 69979)
+++ trunk/Master/tlpkg/tlpsrc/eplain.tlpsrc 2024-02-19 17:40:52 UTC (rev 69980)
Property changes on: trunk/Master/tlpkg/tlpsrc/eplain.tlpsrc
___________________________________________________________________
Modified: texlive:force_incr_after_delete
## -1 +1 ##
-1642984958
\ No newline at end of property
+1708363267
\ No newline at end of property
Index: trunk/Master/tlpkg/tlpsrc/hitex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/hitex.tlpsrc 2024-02-19 10:19:44 UTC (rev 69979)
+++ trunk/Master/tlpkg/tlpsrc/hitex.tlpsrc 2024-02-19 17:40:52 UTC (rev 69980)
Property changes on: trunk/Master/tlpkg/tlpsrc/hitex.tlpsrc
___________________________________________________________________
Modified: texlive:force_incr_after_delete
## -1 +1 ##
-1682293371
\ No newline at end of property
+1708363267
\ No newline at end of property
Index: trunk/Master/tlpkg/tlpsrc/jadetex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/jadetex.tlpsrc 2024-02-19 10:19:44 UTC (rev 69979)
+++ trunk/Master/tlpkg/tlpsrc/jadetex.tlpsrc 2024-02-19 17:40:52 UTC (rev 69980)
Property changes on: trunk/Master/tlpkg/tlpsrc/jadetex.tlpsrc
___________________________________________________________________
Modified: texlive:force_incr_after_delete
## -1 +1 ##
-1707352868
\ No newline at end of property
+1708363267
\ No newline at end of property
Index: trunk/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc 2024-02-19 10:19:44 UTC (rev 69979)
+++ trunk/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc 2024-02-19 17:40:52 UTC (rev 69980)
Property changes on: trunk/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
___________________________________________________________________
Modified: texlive:force_incr_after_delete
## -1 +1 ##
-1608511648
\ No newline at end of property
+1708363267
\ No newline at end of property
Index: trunk/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/latex-bin.tlpsrc 2024-02-19 10:19:44 UTC (rev 69979)
+++ trunk/Master/tlpkg/tlpsrc/latex-bin.tlpsrc 2024-02-19 17:40:52 UTC (rev 69980)
Property changes on: trunk/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
___________________________________________________________________
Modified: texlive:force_incr_after_delete
## -1 +1 ##
-1608511648
\ No newline at end of property
+1708363267
\ No newline at end of property
Index: trunk/Master/tlpkg/tlpsrc/mltex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/mltex.tlpsrc 2024-02-19 10:19:44 UTC (rev 69979)
+++ trunk/Master/tlpkg/tlpsrc/mltex.tlpsrc 2024-02-19 17:40:52 UTC (rev 69980)
Property changes on: trunk/Master/tlpkg/tlpsrc/mltex.tlpsrc
___________________________________________________________________
Modified: texlive:force_incr_after_delete
## -1 +1 ##
-1608511648
\ No newline at end of property
+1708363267
\ No newline at end of property
Index: trunk/Master/tlpkg/tlpsrc/platex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/platex.tlpsrc 2024-02-19 10:19:44 UTC (rev 69979)
+++ trunk/Master/tlpkg/tlpsrc/platex.tlpsrc 2024-02-19 17:40:52 UTC (rev 69980)
Property changes on: trunk/Master/tlpkg/tlpsrc/platex.tlpsrc
___________________________________________________________________
Modified: texlive:force_incr_after_delete
## -1 +1 ##
-1659915767
\ No newline at end of property
+1708363267
\ No newline at end of property
Index: trunk/Master/tlpkg/tlpsrc/uplatex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/uplatex.tlpsrc 2024-02-19 10:19:44 UTC (rev 69979)
+++ trunk/Master/tlpkg/tlpsrc/uplatex.tlpsrc 2024-02-19 17:40:52 UTC (rev 69980)
Property changes on: trunk/Master/tlpkg/tlpsrc/uplatex.tlpsrc
___________________________________________________________________
Modified: texlive:force_incr_after_delete
## -1 +1 ##
-1659915767
\ No newline at end of property
+1708363267
\ No newline at end of property
Index: trunk/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc 2024-02-19 10:19:44 UTC (rev 69979)
+++ trunk/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc 2024-02-19 17:40:52 UTC (rev 69980)
Property changes on: trunk/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc
___________________________________________________________________
Modified: texlive:force_incr_after_delete
## -1 +1 ##
-1608511648
\ No newline at end of property
+1708363267
\ No newline at end of property
Index: trunk/Master/tlpkg/tlpsrc/xetex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/xetex.tlpsrc 2024-02-19 10:19:44 UTC (rev 69979)
+++ trunk/Master/tlpkg/tlpsrc/xetex.tlpsrc 2024-02-19 17:40:52 UTC (rev 69980)
Property changes on: trunk/Master/tlpkg/tlpsrc/xetex.tlpsrc
___________________________________________________________________
Modified: texlive:force_incr_after_delete
## -1 +1 ##
-1644280962
\ No newline at end of property
+1708363267
\ No newline at end of property
Index: trunk/Master/tlpkg/tlpsrc/xmltex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/xmltex.tlpsrc 2024-02-19 10:19:44 UTC (rev 69979)
+++ trunk/Master/tlpkg/tlpsrc/xmltex.tlpsrc 2024-02-19 17:40:52 UTC (rev 69980)
Property changes on: trunk/Master/tlpkg/tlpsrc/xmltex.tlpsrc
___________________________________________________________________
Modified: texlive:force_incr_after_delete
## -1 +1 ##
-1707352869
\ No newline at end of property
+1708363267
\ No newline at end of property
More information about the tex-live-commits
mailing list.