revert changes in tlcritical to fix the TLDownload error

git-svn-id: svn://tug.org/texlive/trunk@39298 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 5 insertions, 10 deletions

diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index c683e4a5263..7619e353e31 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -3182,9 +3182,8 @@ sub action_update {
           $remove_unwind_container = 1;
           $unwind_package = $newname;
         }
-
-        my ($instret, $msg) = TeXLive::TLUtils::unpack("$unwind_package",
-          $localtlpdb->root);
+        my $instret = TeXLive::TLPDB->_install_package("$unwind_package", 0,
+                                                       [], $localtlpdb);
         if ($instret) {
           # now we have to include the tlpobj
           my $tlpobj = TeXLive::TLPOBJ->new;
@@ -3197,7 +3196,6 @@ 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
@@ -3670,12 +3668,9 @@ sub action_install {
       info("[$currnr/$totalnr, $estrem/$esttot] ${re}install: $pkg$tagstr [${kb}k]\n");
     }
     if (!$opts{"dry-run"}) {
-      if ($remotetlpdb->install_package($pkg, $localtlpdb,
-            ($packs{$pkg} ? $packs{$pkg} : undef) )) {
-        logpackage("${re}install: $pkg$tagstr");
-      } else {
-        logpackage("failed ${re}install: $pkg$tagstr");
-      }
+      $remotetlpdb->install_package($pkg, $localtlpdb,
+        ($packs{$pkg} ? $packs{$pkg} : undef) );
+      logpackage("${re}install: $pkg$tagstr");
     }
     $donesize += $sizes{$pkg};
     $currnr++;