diff options
author | Norbert Preining <preining@logic.at> | 2010-02-06 04:36:14 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2010-02-06 04:36:14 +0000 |
commit | 6aebcdea2f95afe5784b46da9596a5e21fabcbc9 (patch) | |
tree | 5343e4a4eb00ce03b10658b09774cb107ad7a4cc /Master | |
parent | dc8ee368aa90e6f3bfd5fe35c1051427ee11033e (diff) |
(try) make sure that the rogue texmf-dist/tlpkg directory is removed
git-svn-id: svn://tug.org/texlive/trunk@16923 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/tlpkg/TeXLive/TLPOBJ.pm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm index 1791cf81635..9ebc3ca86c5 100644 --- a/Master/tlpkg/TeXLive/TLPOBJ.pm +++ b/Master/tlpkg/TeXLive/TLPOBJ.pm @@ -547,8 +547,12 @@ sub make_container { chdir($instroot); # in the relative case we have to chdir to the respective tltree # and put the tlpobj into the root! + my $removetlpkgdir = 0; if ($relative) { chdir("./$tltree"); + # in the relocatable case we will probably create the tlpkg dir + # in texmf-dist/tlpkg and want to remove it afterwards. + $removetlpkgdir = 1; # we don't need to change the $tlpobjdir because we put it in # all cases into tlpkg/tlpobj #$tlpobjdir = "./tlpkg/tlpobj"; @@ -690,6 +694,7 @@ sub make_container { unlink("$tlpobjdir/$self->{'name'}.tlpobj"); unlink($tartempfile) if $tartempfile; rmdir($tlpobjdir) if $removetlpobjdir; + rmdir($InfraLocation) if $removetlpkgdir; xchdir($cwd); debug(" done $containername, size $size, $md5\n"); |