summaryrefslogtreecommitdiff
path: root/Master/texmf
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-08-13 16:59:46 +0000
committerNorbert Preining <preining@logic.at>2009-08-13 16:59:46 +0000
commitd2cf62f4644b963bdbcc502e49d2e49533990f81 (patch)
treeff0f2bf4406e9efb0611a9390f4776430a57e4e9 /Master/texmf
parent247eb77bb7e4eaf27ce6d1ea9c031f86378f410c (diff)
fixes for new win32 packages
git-svn-id: svn://tug.org/texlive/trunk@14649 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf')
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl10
1 files changed, 5 insertions, 5 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 75fa7511b3b..31e7b5d65bd 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -2333,8 +2333,9 @@ sub action_option {
# ARCH
#
sub action_arch {
- my @extra_w32_packs_src = qw/tlperl.win32 tlgs.win32 tlpsv.win32
- collection-wintools/;
+ my @extra_w32_packs = qw/tlperl.win32 tlgs.win32 tlpsv.win32
+ collection-wintools
+ dviout.win32 wintools.win32/;
if ($^O=~/^MSWin(32|64)$/i) {
warn("action `arch' not supported on Windows\n");
}
@@ -2365,7 +2366,6 @@ 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;
@@ -2398,7 +2398,7 @@ sub action_arch {
}
if (TeXLive::TLUtils::member('win32', @todoarchs)) {
# install the necessary w32 stuff
- for my $p (@winpacks) {
+ for my $p (@extra_w32_packs) {
info("install: $p\n");
$tlmediasrc->install_package($p, $localtlpdb) if (!$opts{"dry-run"});
}
@@ -2446,7 +2446,7 @@ sub action_arch {
}
}
if (TeXLive::TLUtils::member('win32', @todoarchs)) {
- for my $p (@winpacks) {
+ for my $p (@extra_w32_packs) {
info("remove: $p\n");
$localtlmedia->remove_package($p) if (!$opts{"dry-run"});
}