tl-update-containers: .source and .doc are not real packages, only the

containers should be removed


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

1 files changed, 10 insertions, 4 deletions

diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index b9d9db9a9ae..d246dba4d8d 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -83,6 +83,7 @@ sub main
 
   my @todopacks = ();
   my @removepacks = ();
+  my @removecontainers = ();
   my $opt_containerdir = "$opt_location/$TeXLive::TLConfig::Archive";
   my $nettlpdb;
   my %count;
@@ -236,12 +237,12 @@ sub main
           }
         } else {
           # no src files in the package, so remove old .source containers
-          push @removepacks, "$pkg.source";
+          push @removecontainers, "$pkg.source";
         }
       }
     } else {
       # remove the .source container
-      push @removepacks, "$pkg.source";
+      push @removecontainers, "$pkg.source";
     }
     if ($docsplit) {
       if (!$opt_dry) {
@@ -259,12 +260,12 @@ sub main
           }
         } else {
           # no doc files in the package, so remove old .doc containers
-          push @removepacks, "$pkg.doc";
+          push @removecontainers, "$pkg.doc";
         }
       }
     } else {
       # remove the .doc containers
-      push @removepacks, "$pkg.doc";
+      push @removecontainers, "$pkg.doc";
     }
     if (!$opt_dry) {
       my ($s,$m) = $objcopy->make_container($type, $Master, $opt_containerdir,
@@ -281,6 +282,11 @@ sub main
     $nettlpdb->add_tlpobj($obj) unless $opt_dry;
   }
 
+  # remove old containers
+  for my $op (@removecontainers) {
+    info("$0: $op container is old, removing it\n");
+    `rm -f $opt_containerdir/$op.*` unless $opt_dry;
+  }
   # next we remove those containers which have been gone!
   REMOVEPACK: for my $op (@removepacks) {
     foreach my $manualpkgre (@critical_pkg_list) {