summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-08-13 16:52:17 +0000
committerNorbert Preining <preining@logic.at>2009-08-13 16:52:17 +0000
commit247eb77bb7e4eaf27ce6d1ea9c031f86378f410c (patch)
treef3dc71ae4e5b5820f20c9b6b7d72b550e20bb87b /Master
parentf9a5550ba71b1bb580f5f689681d8bfc7023a458 (diff)
expand deps on the windows addon packages add arch add|remove time
git-svn-id: svn://tug.org/texlive/trunk@14648 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl9
1 files changed, 5 insertions, 4 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index f593a3dd283..75fa7511b3b 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -2333,8 +2333,8 @@ sub action_option {
# ARCH
#
sub action_arch {
- my @extra_w32_packs = qw/tlperl.win32 tlgs.win32 tlpsv.win32
- collection-wintools/;
+ my @extra_w32_packs_src = qw/tlperl.win32 tlgs.win32 tlpsv.win32
+ collection-wintools/;
if ($^O=~/^MSWin(32|64)$/i) {
warn("action `arch' not supported on Windows\n");
}
@@ -2365,6 +2365,7 @@ sub action_arch {
} elsif ($what =~ m/^add$/i) {
init_tlmedia();
my $mediatlpdb = $tlmediasrc->tlpdb;
+ my @winpacks = $tlmediatlpdb->expand_dependencies($localtlpdb, @extra_w32_packs);
my @already_installed_arch = $localtlpdb->available_architectures;
my @available_arch = $mediatlpdb->available_architectures;
my @todoarchs;
@@ -2397,7 +2398,7 @@ sub action_arch {
}
if (TeXLive::TLUtils::member('win32', @todoarchs)) {
# install the necessary w32 stuff
- for my $p (@extra_w32_packs) {
+ for my $p (@winpacks) {
info("install: $p\n");
$tlmediasrc->install_package($p, $localtlpdb) if (!$opts{"dry-run"});
}
@@ -2445,7 +2446,7 @@ sub action_arch {
}
}
if (TeXLive::TLUtils::member('win32', @todoarchs)) {
- for my $p (@extra_w32_packs) {
+ for my $p (@winpacks) {
info("remove: $p\n");
$localtlmedia->remove_package($p) if (!$opts{"dry-run"});
}