summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-05-07 10:51:43 +0000
committerNorbert Preining <preining@logic.at>2009-05-07 10:51:43 +0000
commitddb7d0cdd66bcc4bdc547765939ecf7afbc60ebe (patch)
treeb594d4809521b5874cb16e42a8425061535efd49
parent9f4b5874cd718916808a10829bca31744e050265 (diff)
remove included tlpobj after installation of a container, the tlpobj
is recreated anyway in the right place git-svn-id: svn://tug.org/texlive/branches/branch2009-dev@12977 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/TeXLive/TLMedia.pm8
1 files changed, 7 insertions, 1 deletions
diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm
index 1aff9af6f11..0949365fe49 100644
--- a/Master/tlpkg/TeXLive/TLMedia.pm
+++ b/Master/tlpkg/TeXLive/TLMedia.pm
@@ -259,6 +259,8 @@ sub _install_package {
# one), xzdec them, and then call tar
my $fn = basename($what);
+ my $pkg = $fn;
+ $pkg =~ s/\.tar(\.xz)?$//;
mkdirhier("$target/temp");
my $tarfile;
my $remove_tarfile = 1;
@@ -314,7 +316,11 @@ sub _install_package {
$remove_tarfile = 0;
}
}
- return TeXLive::TLUtils::untar($tarfile, $target, $remove_tarfile);
+ my $ret = TeXLive::TLUtils::untar($tarfile, $target, $remove_tarfile);
+ # remove the $pkg.tlpobj, we recreate it anyway again
+ unlink ("$target/tlpkg/tlpobj/$pkg.tlpobj")
+ if (-r "$target/tlpkg/tlpobj/$pkg.tlpobj"):
+ return $ret;
} else {
tlwarn("_install_package: Don't know how to install $what\n");
return(0);