diff options
Diffstat (limited to 'Master/tlpkg/TeXLive/TLMedia.pm')
-rw-r--r-- | Master/tlpkg/TeXLive/TLMedia.pm | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm index f60462bc82e..773f0550e08 100644 --- a/Master/tlpkg/TeXLive/TLMedia.pm +++ b/Master/tlpkg/TeXLive/TLMedia.pm @@ -224,8 +224,7 @@ sub install_package { $totlpdb->add_tlpobj($tlpobj); $totlpdb->save; # compute the return value - my %ret; - merge_into(\%ret, $tlpobj->make_return_hash_from_executes("enable")); + TeXLive::TLUtils::announce_execute_actions("enable", $tlpobj); if (!$nopostinstall) { # do the postinstallation actions # @@ -235,8 +234,8 @@ sub install_package { $totlpdb->option_desktop_integration, $totlpdb->option_post_code); } - return \%ret; } + return 1; } # @@ -359,13 +358,12 @@ sub remove_package { my ($self, $pkg, $nopostinstall) = @_; my $localtlpdb = $self->tlpdb; my $tlp = $localtlpdb->get_package($pkg); - my %ret; if (!defined($tlp)) { tlwarn ("$pkg: package not present, cannot remove\n"); } else { if ($pkg =~ m/^texlive\.infra/) { log ("Not removing $pkg, it is essential!\n"); - return; + return 0; } # we have to chdir to $localtlpdb->root my $Master = $localtlpdb->root; @@ -439,8 +437,7 @@ sub remove_package { rmdir $d; } $localtlpdb->remove_package($pkg); - merge_into(\%ret, $tlp->make_return_hash_from_executes("disable")); - $ret{'mktexlsr'} = 1; + TeXLive::TLUtils::announce_execute_actions("disable", $tlp); # should we save at each removal??? # advantage: the tlpdb actually reflects what is installed # disadvantage: removing a collection calls the save routine several times @@ -457,7 +454,7 @@ sub remove_package { 0); } } - return \%ret; + return 1; } |