diff options
| -rwxr-xr-x | Master/texmf/scripts/texlive/tlmgr.pl | 3 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLMedia.pm | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index 35696490f36..80859c5e7c9 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -260,10 +260,9 @@ sub remove_package { $ret{'mktexlsr'} = 1; # remove those bin dependencies .ARCH foreach my $d ($tlp->depends) { - my %binfiles = %{$tlp->binfiles}; if ($d eq "$pkg.ARCH") { foreach my $a ($localtlpdb->available_architectures) { - if (defined($binfiles{$a})) { + if (defined($localtlpdb->get_package("$pkg.$a"))) { merge_into(\%ret, &remove_package("$pkg.$a", $localtlpdb, $force)); } diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm index 449534e23c6..dfa2c2669bd 100644 --- a/Master/tlpkg/TeXLive/TLMedia.pm +++ b/Master/tlpkg/TeXLive/TLMedia.pm @@ -209,10 +209,8 @@ sub install_package { # we only want to try to install a .ARCH package if it actually contains # files my $foo = $1; - my $hashref = $totlpdb->get_package("$foo"); - my %binfiles = %{$hashref}; foreach my $a ($totlpdb->available_architectures) { - if (defined($binfiles{$a}) && + if (defined($fromtlpdb->get_package("$foo.$a")) && !defined($totlpdb->get_package("$foo.$a"))) { merge_into(\%ret, $self->install_package("$foo.$a", $totlpdb, $nodepends, $fallbackmedia, 0)); |