1 files changed, 7 insertions, 98 deletions

diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index c56266d8c8c..3cba91a6600 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -419,100 +419,6 @@ sub writeout_simple {
   }
 }
 
-###
-### OLD VERSION WITH zip SUPPORT AND WITHOUT USING $::progs
-### sub make_container {
-###   my ($self,$type,$instroot,$destdir,$containername,$relative) = @_;
-###   my @files = ();
-###   my $compresscmd;
-###   my $tlpobjdir = "$InfraLocation/tlpobj";
-###   my %binf = %{$self->{'binfiles'}};
-###   foreach (keys %binf) {
-###     push @files, @{$binf{$_}};
-###   }
-###   push @files, $self->runfiles;
-###   push @files, $self->docfiles;
-###   push @files, $self->srcfiles;
-###   if ($^O =~ /MSWin32/) {
-###     $nul = "nul";
-###   } else {
-###     $nul = "/dev/null";
-###   }
-###   @files = TeXLive::TLUtils::sort_uniq(@files);
-###   # we do relative packages ONLY if the files do NOT span multiple
-###   # texmf trees. check this here
-###   my $tltree;
-###   if ($relative) {
-###     foreach (@files) {
-###       my $tmp;
-###       ($tmp) = split m@/@;
-###       if (defined($tltree) && ($tltree ne $tmp)) {
-###         die "Not generating relative package for multiple tree spanning packages!\n";
-###       } else {
-###         $tltree = $tmp;
-###       }
-###     }
-###     my @nf;
-###     map { s@^$tltree/@@ ; push @nf, $_; } @files;
-###     @files = @nf;
-###   }
-###   # load Cwd only if necessary ...
-###   require Cwd;
-###   my $cwd = &Cwd::getcwd;
-###   if ("$destdir" !~ m@^/@) {
-###     # we have an relative containerdir, so we have to make it absolute
-###     $destdir = "$cwd/$destdir";
-###   }
-###   &TeXLive::TLUtils::mkdirhier("$destdir");
-###   chdir($instroot);
-###   # in the relative case we have to chdir to the respective tltree
-###   # and put the tlpobj into the root!
-###   if ($relative) {
-###     chdir("./$tltree");
-###     $tlpobjdir = ".";
-###   }
-###   # we add the .tlpobj into the .tlpobj directory
-###   my $removetlpobjdir = 0;
-###   if (! -d "$tlpobjdir") {
-###     &TeXLive::TLUtils::mkdirhier("$tlpobjdir");
-###     $removetlpobjdir = 1;
-###   }
-###   open(TMP,">$tlpobjdir/$self->{'name'}.tlpobj") or die "Cannot create $tlpobjdir/$self->{'name'}.tlpobj";
-###   $self->writeout(\*TMP);
-###   close(TMP);
-###   push @files, "$tlpobjdir/$self->{'name'}.tlpobj";
-###   if ($type eq "zip") {
-###     $containername .= ".zip";
-###       if ($^O =~ /MSWin32/) {
-###       $compresscmd = "| zip -9\@or $destdir/$containername > $nul"
-###     } else {
-###       $compresscmd = "| zip -9\@ory $destdir/$containername > $nul"
-###     }
-###   } elsif ($type eq "lzma") {
-###     $containername .= ".tar.lzma";
-###     $compresscmd = "| tar --create --files-from=-  | lzma -c > $destdir/$containername ";
-###   } else {
-###     die("Container method $type unknown!\n");
-###   }
-###   unlink("$destdir/$containername");
-###   tllog($::LOG_DDDEBUG, "$compresscmd\n");
-###   open ZIP, $compresscmd or die "Cannot open container program $compresscmd: $!\n";
-###   map {
-###     if (! -f $_) {
-###       print STDERR "!!!Error: non-existent $_\n";
-###     } else {
-###       print ZIP "$_\n";
-###     }
-###   } @files;
-###   close ZIP;
-###   # cleaning up
-###   unlink("$tlpobjdir/$self->{'name'}.tlpobj");
-###   rmdir("$tlpobjdir") if $removetlpobjdir;
-###   chdir($cwd);
-###   tllog($::LOG_DDDEBUG, "Done $containername\n");
-### }
-###
-
 sub make_container {
   my ($self,$type,$instroot,$destdir,$containername,$relative) = @_;
   if (($type ne "lzma") && ($type ne "tar")) {
@@ -596,6 +502,8 @@ sub make_container {
     }
   }
   my @cmdline = ($tar, "--owner", "0", "--group", "0", "-c", "-f", "$destdir/$tarname", "--files-from=-");
+  #debug("make_container: running @cmdline\n");
+  
   unlink("$destdir/$containername");
   unlink("$destdir/$tarname");
   if (win32()) {
@@ -608,8 +516,9 @@ sub make_container {
   map {
     if (-f $_ || -l $_) {
       print ZIP "$_\n";
+      
     } else {
-      print STDERR "!!!Error: non-existent $_\n";
+      tlwarn("!!!Error: non-existent $_\n");
     }
   } @files;
   close ZIP;
@@ -1072,15 +981,15 @@ sub cataloguedata {
   return $self->{'cataloguedata'};
 }
 
-1;
-
-###### Formats
 format multilineformat =
 longdesc ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<~~
 $_tmp
 .
+
+1;
 __END__
 
+
 =head1 NAME
 
 C<TeXLive::TLPOBJ> -- TeX Live Package Object access module