another round of fixes for relocatable support, if the file list is too

long and collapsed we have to cancel again the RelocTree stuff


git-svn-id: svn://tug.org/texlive/branches/branch2009-dev@12981 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 9 insertions, 3 deletions

diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index a4698bc1dae..f28f8974cb9 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -499,9 +499,11 @@ sub make_container {
       die ("$0: package $containername spans multiple trees, "
            . "relative generation not allowed");
     }
-    my @nf;
-    map { s@^$tltree/@@ ; push @nf, $_; } @files;
-    @files = @nf;
+    if ($tltree ne $RelocTree) {
+      die ("$0: building $pkg container relocatable but the comon prefix"
+           . "is not $RelocTree");
+    } 
+    s,^$RelocTree/,, foreach @files;
   }
   # load Cwd only if necessary ...
   require Cwd;
@@ -604,7 +606,11 @@ sub make_container {
       # A complication, as always.  collapse_dirs returns absolute paths.
       # We want to change them back to relative so that the backup tar
       # has the same structure.
+      # in relative mode we have to remove the texmf-dist prefix, too
       s,^$instroot/,, foreach @files_to_backup;
+      if ($relative) {
+        s,^$RelocTree/,, foreach @files_to_backup;
+      }
     }
     push(@cmdline, @files_to_backup);
   }