summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-04-19 21:17:05 +0000
committerKarl Berry <karl@freefriends.org>2024-04-19 21:17:05 +0000
commitca97e4dbae3aee80190e6ebfbcbc919ba7b528c6 (patch)
tree43e6aabfee9074893bea3d085fb08ee6f25a091a
parenta7a990f3c543428ed88a82bb528a54172c04377a (diff)
explicitly ignore l3(kernel|backend)-dev for runtime dups; more info if fmttriggers differ
git-svn-id: svn://tug.org/texlive/trunk@71004 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl1
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm26
2 files changed, 20 insertions, 7 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 446b9dee0f0..d24047b077a 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -5738,6 +5738,7 @@ sub check_runfiles {
$omit_pkgs .= '^0+texlive|^bin-|^collection-|^scheme-|^texlive-|^texworks';
$omit_pkgs .= '|^pgf$'; # intentionally duplicated .lua
$omit_pkgs .= '|^latex-.*-dev$'; # intentionally duplicated base latex
+ $omit_pkgs .= '|^l3(kernel|backend)-dev$'; # more base latex
my @runtime_files = ();
#
foreach my $tlpn ($localtlpdb->list_packages) {
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 8acc6af8da3..f7d919c9291 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -4866,6 +4866,11 @@ sub tlnet_disabled_packages {
return @ret;
}
+=item C<< report_tlpdb_differences($rret) >>
+
+Report, using info function, as given in hash reference argument RET,
+with keys removed_packages, added_packages, different_packages.
+
sub report_tlpdb_differences {
my $rret = shift;
my %ret = %$rret;
@@ -4884,21 +4889,28 @@ sub report_tlpdb_differences {
}
if (defined($ret{'different_packages'})) {
info ("different packages from A to B:\n");
+ my $printed_fmttriggers_msg = 0;
for my $p (sort keys %{$ret{'different_packages'}}) {
- info (" $p\n");
+ info (" $p:\n");
for my $k (sort keys %{$ret{'different_packages'}->{$p}}) {
if ($k eq "revision") {
- info(" revision differ: $ret{'different_packages'}->{$p}->{$k}\n");
+ info(" revision differ: $ret{'different_packages'}->{$p}->{$k}\n");
} elsif ($k eq "removed" || $k eq "added") {
- info(" $k files:\n");
+ info (" $k files:\n");
for my $f (sort @{$ret{'different_packages'}->{$p}->{$k}}) {
- info(" $f\n");
+ info (" $f\n");
}
- } else {
- # e.g., fmttriggers; don't bother making a complete report.
+ } elsif ($k eq "fmttriggers") {
+ # fmttriggers; don't bother making a complete report.
# The fmttriggers will differ when the global variables in
- # 00texlive.autopatterns.tlpsrc change but we forget to
+ # 00texlive.autopatterns.tlpsrc change but we forgot to
# tlforceincr all the packages that depend on the variables.
+ # Which happens depressingly often.
+ info(" $k differ)\n");
+ info("(if 00texlive.autopatterns change, tlforceincr dependents.)\n")
+ if ! $printed_fmttriggers_msg; # just show once
+ $printed_fmttriggers_msg = 1;
+ } else {
info(" $k differ\n");
}
}