move the test for texlive.infra to the actual remove_package sub so that it

works also for the remove action


git-svn-id: svn://tug.org/texlive/trunk@8638 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 6 insertions, 6 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 35d7e129081..62a3b53fc4f 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -217,6 +217,10 @@ sub remove_package {
         return;
       }
     }
+    if ($pkg eq "texlive.infra") {
+      log("Not removing texlive.infra, it is essential!\n");
+      return;
+    }
     print "remove: $pkg\n";
     # we have to chdir to $localtlpdb->root
     my $Master = $localtlpdb->root;
@@ -594,7 +598,7 @@ sub action_update {
     next if ($pkg =~ m/^00texlive/);
     # it looks like that can actually be done!!!
     # It gives several warnings but afterwards the files are changed. Strange
-    #if (win32() && (($pkg eq "texlive-infra") || ($pkg eq "bin-texlive"))) {
+    #if (win32() && (($pkg eq "texlive.infra") || ($pkg eq "bin-texlive"))) {
     #  info("We cannot upgrade $pkg on win32, since we are running it!\n");
     #  next;
     #}
@@ -630,11 +634,7 @@ sub action_update {
           }
         }
         print "update: $pkg (first remove old, then install new)\n";
-        if ($pkg eq "texlive.infra") {
-          log ("Not removing texlive.infra prior to upgrading\n");
-        } else {
-          merge_into(\%ret, &remove_package($pkg, $localtlpdb, 1));
-        }
+        merge_into(\%ret, &remove_package($pkg, $localtlpdb, 1));
         merge_into(\%ret, $tlmediasrc->install_package($pkg, $localtlpdb, $opt_nodepends, 0));
         print "update: $pkg done\n";
       }