diff options
Diffstat (limited to 'Master/tlpkg/TeXLive/TLPDB.pm')
-rw-r--r-- | Master/tlpkg/TeXLive/TLPDB.pm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index 89d0441c7ed..fa4c0965e51 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -1369,9 +1369,12 @@ sub install_package_files { # - create a tmp directory my $tmpdir = TeXLive::TLUtils::tl_tmpdir(); # - unpack everything there - if (!TeXLive::TLUtils::unpack($f, $tmpdir)) { - tlwarn("TLPDB::install_package_files: couldn't install $f\n"); - next; + { + my ($ret, $msg) = TeXLive::TLUtils::unpack($f, $tmpdir); + if (!$ret) { + tlwarn("TLPDB::install_package_files: $msg\n"); + next; + } } # we are still here, so the files have been unpacked properly # we need now to find the tlpobj in $tmpdir/tlpkg/tlpobj/ @@ -1664,7 +1667,7 @@ sub _install_data { my $wget = $::progs{'wget'}; my $xzdec = TeXLive::TLUtils::quotify_path_with_spaces($::progs{'xzdec'}); if (!defined($wget) || !defined($xzdec)) { - tlwarn("TLPDB::_install_package: programs not set up properly; hmm.\n"); + tlwarn("TLPDB::_install_data: programs not set up properly; hmm.\n"); return(0); } @@ -1701,9 +1704,9 @@ sub _install_data { $target .= "/$TeXLive::TLConfig::RelocTree"; } } - my $pkg = TeXLive::TLUtils::unpack($what, $target, 'size' => $whatsize, 'checksum' => $whatcheck); - if (!$pkg) { - tlwarn("TLPDB::_install_package: couldn't unpack $what to $target\n"); + my ($ret, $pkg) = TeXLive::TLUtils::unpack($what, $target, 'size' => $whatsize, 'checksum' => $whatcheck); + if (!$ret) { + tlwarn("TLPDB::_install_package: $pkg\n"); return(0); } # remove the $pkg.tlpobj, we recreate it anyway again |