summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLMedia.pm
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-05-15 08:52:12 +0000
committerNorbert Preining <preining@logic.at>2008-05-15 08:52:12 +0000
commit760f0b88420ad1079b5596e469b55fda9cf374d5 (patch)
tree75bbc35bb1c5bc709f7895339917864996555e8d /Master/tlpkg/TeXLive/TLMedia.pm
parent168e470deff278cbe71353ed8fcb5fb524eb6746 (diff)
fix for available_archs problem:
- no save the list of available/installed archs into 00texlive-installation.config at installation time. TLPDB->available_archs will read that and NOT check for bin-tex.ARCHs - update tlpsrc/00texlive-installation.config.tlpsrc to contain all the currently available archs. THAT COULD BE AUTOGENERATED!!! - add option_archs to TLPDB, rewrite TLPDB->available_archs to use that one - TLMedia.pm: install .ARCH dpeends in *ANY* case, even if --nodepends is given git-svn-id: svn://tug.org/texlive/trunk@8150 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive/TLMedia.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLMedia.pm32
1 files changed, 17 insertions, 15 deletions
diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm
index 7ac2901f415..d1cdb14d627 100644
--- a/Master/tlpkg/TeXLive/TLMedia.pm
+++ b/Master/tlpkg/TeXLive/TLMedia.pm
@@ -193,23 +193,25 @@ sub install_package {
my %ret;
merge_into(\%ret, $tlpobj->make_return_hash_from_executes("enable"));
# now install all the depends if they are not already present
- if (!$nodepends) {
- foreach my $d ($tlpobj->depends) {
- if ($d =~ m/^(.*)\.ARCH$/) {
- my $foo = $1;
- foreach my $a ($totlpdb->available_architectures) {
- if (!defined($totlpdb->get_package("$foo.$a"))) {
- merge_into(\%ret,
- $self->install_package("$foo.$a", $totlpdb, $nodepends, $fallbackmedia));
- }
- }
- } elsif ($d =~ m/^(.*).win32$/) {
- # install only of win32 is under the available archs
- if (TeXLive::TLUtils::member("win32",$totlpdb->available_architectures)) {
+ # NOTE: installation of .ARCH dependencies is done in *ANY*CASE*, regardless
+ # of the $nodepends setting
+ foreach my $d ($tlpobj->depends) {
+ if ($d =~ m/^(.*)\.ARCH$/) {
+ my $foo = $1;
+ foreach my $a ($totlpdb->available_architectures) {
+ if (!defined($totlpdb->get_package("$foo.$a"))) {
merge_into(\%ret,
- $self->install_package($d, $totlpdb, $nodepends, $fallbackmedia));
+ $self->install_package("$foo.$a", $totlpdb, $nodepends, $fallbackmedia));
}
- } else {
+ }
+ } elsif ($d =~ m/^(.*).win32$/) {
+ # install only of win32 is under the available archs
+ if (TeXLive::TLUtils::member("win32",$totlpdb->available_architectures)) {
+ merge_into(\%ret,
+ $self->install_package($d, $totlpdb, $nodepends, $fallbackmedia));
+ }
+ } else {
+ if (!$nodepends) {
if (!defined($totlpdb->get_package($d))) {
# we have to install it!
merge_into(\%ret,