diff options
| author | Norbert Preining <preining@logic.at> | 2008-05-13 20:09:28 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2008-05-13 20:09:28 +0000 |
| commit | 8c5363d3005c702881edbd7068d4ab68d09784ec (patch) | |
| tree | 14ebbec48d5b4c92edb4631f324e9f24a476ddc2 /Master/tlpkg | |
| parent | c6168f59843ce21988e1c11aae4861378182fdfb (diff) | |
TLPOBJ::make_return_hash_from_executes add a new parameter to discern
installation from removal
git-svn-id: svn://tug.org/texlive/trunk@8113 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
| -rw-r--r-- | Master/tlpkg/TeXLive/TLMedia.pm | 2 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLPOBJ.pm | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm index b9babeaed1d..7ac2901f415 100644 --- a/Master/tlpkg/TeXLive/TLMedia.pm +++ b/Master/tlpkg/TeXLive/TLMedia.pm @@ -191,7 +191,7 @@ sub install_package { $totlpdb->save; # compute the return value my %ret; - merge_into(\%ret, $tlpobj->make_return_hash_from_executes); + 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) { diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm index e5927f358ac..f9fa7942b3c 100644 --- a/Master/tlpkg/TeXLive/TLPOBJ.pm +++ b/Master/tlpkg/TeXLive/TLPOBJ.pm @@ -789,6 +789,10 @@ sub allbinfiles { sub make_return_hash_from_executes { my $self = shift; + my $type = shift; + if (!defined($type) || (($type ne "enable") && ($type ne "disable"))) { + die "type for make_return_hash_from_executes must be either enable or disable"; + } my %ret; my (@maps, @formats, @dats); if ($self->runfiles) { @@ -802,7 +806,11 @@ sub make_return_hash_from_executes { } foreach my $e ($self->executes) { if ($e =~ m/^add((Mixed)?Map)\s+([^\s]+)\s*$/) { - push @maps, "enable $1=$3"; + if ($type eq "enable") { + push @maps, "enable $1=$3"; + } else { + push @maps, "disable $3"; + } } elsif ($e =~ m/^BuildFormat\s+([^\s]+)\s*$/) { push @formats, $1; } elsif ($e =~ m/^BuildLanguageDat\s+([^\s]+)\s*$/) { |