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*$/) {