diff options
author | Norbert Preining <preining@logic.at> | 2016-01-12 03:24:41 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2016-01-12 03:24:41 +0000 |
commit | ab71272dc887ec428cdf2868adfd2c77431bdc48 (patch) | |
tree | 9ce9760ca852bd504a36886cab3c11cbe130d1d0 /Master/texmf-dist/scripts | |
parent | f4b76f9ebfdadf174da0ada9d6d48c71e40bf47d (diff) |
Re-apply temporary removed changes to installer and tlmgr
The changes in svn 39284-39294 have been reverted in svn 39298
to fix a bug in TLDownload that slipped out (svn 39300). Reapply
these changes.
git-svn-id: svn://tug.org/texlive/trunk@39362 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts')
-rwxr-xr-x | Master/texmf-dist/scripts/texlive/tlmgr.pl | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index 7619e353e31..c683e4a5263 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -3182,8 +3182,9 @@ sub action_update { $remove_unwind_container = 1; $unwind_package = $newname; } - my $instret = TeXLive::TLPDB->_install_package("$unwind_package", 0, - [], $localtlpdb); + + my ($instret, $msg) = TeXLive::TLUtils::unpack("$unwind_package", + $localtlpdb->root); if ($instret) { # now we have to include the tlpobj my $tlpobj = TeXLive::TLPOBJ->new; @@ -3196,6 +3197,7 @@ sub action_update { } else { logpackage("failed restore: $pkg ($rev)"); tlwarn("$prg: Restoring of old package did NOT succeed.\n"); + tlwarn("$prg: Error message from unpack: $msg\n"); tlwarn("$prg: Most likely repair: run tlmgr install $pkg and hope.\n"); # TODO_ERRORCHECKING # should we return F_ERROR here??? If we would do this, then @@ -3668,9 +3670,12 @@ sub action_install { info("[$currnr/$totalnr, $estrem/$esttot] ${re}install: $pkg$tagstr [${kb}k]\n"); } if (!$opts{"dry-run"}) { - $remotetlpdb->install_package($pkg, $localtlpdb, - ($packs{$pkg} ? $packs{$pkg} : undef) ); - logpackage("${re}install: $pkg$tagstr"); + if ($remotetlpdb->install_package($pkg, $localtlpdb, + ($packs{$pkg} ? $packs{$pkg} : undef) )) { + logpackage("${re}install: $pkg$tagstr"); + } else { + logpackage("failed ${re}install: $pkg$tagstr"); + } } $donesize += $sizes{$pkg}; $currnr++; |