diff options
| -rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 3 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tl-compare-tlpdbs | 11 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tl-update-tlnet | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 26f35e009a7..38fcb781b1f 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -3089,8 +3089,9 @@ sub compare_tlpobjs { # $ret{'different_packages'}->{$package} = output of compare_tlpobjs # sub compare_tlpdbs { - my ($tlpdbA, $tlpdbB) = @_; + my ($tlpdbA, $tlpdbB, @add_ignored_packs) = @_; my @ignored_packs = qw/00texlive.installer 00texlive.image/; + push @ignored_packs, @add_ignored_packs; my @inAnotinB; my @inBnotinA; diff --git a/Master/tlpkg/bin/tl-compare-tlpdbs b/Master/tlpkg/bin/tl-compare-tlpdbs index 7aedb79f731..8c19ec4d0fe 100755 --- a/Master/tlpkg/bin/tl-compare-tlpdbs +++ b/Master/tlpkg/bin/tl-compare-tlpdbs @@ -19,7 +19,9 @@ use TeXLive::TLPDB; use Getopt::Long; use Pod::Usage; -my @ignored_packs = qw/00texlive.installer 00texlive.image/; +# packages ignored unless --all is given +# see @critical_pkg_list in tl-update-containers +my @add_ignored_packs = qw/texlive.infra/; our ($mydir, $vc_id); my $opt_version = 0; @@ -28,7 +30,9 @@ my $opt_help = 0; TeXLive::TLUtils::process_logging_options(); GetOptions( "version" => \$opt_version, - "help|?" => \$opt_help) or pod2usage(1); + "help|?" => \$opt_help, + "all" => sub { @add_ignored_packs = () }, +) or pod2usage(1); pod2usage("-exitstatus" => 0, "-verbose" => 2) if $opt_help; if ($opt_version) { print "$vc_id\n"; exit 0; } @@ -82,7 +86,8 @@ sub main $tlpdbA->from_file($tlpdbAsrc); $tlpdbB->from_file($tlpdbBsrc); - my %ret = TeXLive::TLUtils::compare_tlpdbs($tlpdbA, $tlpdbB); + my %ret = TeXLive::TLUtils::compare_tlpdbs( + $tlpdbA, $tlpdbB, @add_ignored_packs); # anything reported here is a difference in tlpdbs which we do not want if (keys %ret) { diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index 3c81362dab3..573daf7590c 100755 --- a/Master/tlpkg/bin/tl-update-tlnet +++ b/Master/tlpkg/bin/tl-update-tlnet @@ -170,7 +170,7 @@ if test $failure = false; then for cmd in \ "$tltryinst/$yyyy/bin/*/tlmgr update --list" \ "$Master/tlpkg/bin/check-tlnet-consistency --location=$tltry" \ - "$Master/tlpkg/bin/tl-compare-tlpdbs $tltry/tlpkg/texlive.tlpdb" \ + "$Master/tlpkg/bin/tl-compare-tlpdbs $critical $tltry/tlpkg/texlive.tlpdb" \ ; do cmdname=`echo "$cmd" | awk '{print $1}'` basecmd=`basename $cmdname` |