more cleanup in the output of tlmgr, now counts auto-removed packages

into the [n/N].


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

1 files changed, 13 insertions, 3 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index b6908ec3758..3f32bb63543 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1565,16 +1565,26 @@ sub action_update {
   # we have to remove all the stuff before we install other packages
   # to support moving of files from one package to another.
   # remove the packages that have disappeared:
+  if (!$opts{"no-remove"}) {
+    my @foo = keys %removals;
+    $totalnr += $#foo + 1;
+  }
   for my $p (keys %removals) {
     if ($opts{"no-remove"}) {
       info("not removing $p due to -no-remove (removed on server)\n");
     } else {
+      my $rev = $localtlmedia->tlpdb->get_package($p)->revision;
       if ($::machinereadable) {
         # TODO version numbers
-        machine_line($p, $FLAG_REMOVE, "-", "-", "-");
+        machine_line($p, $FLAG_REMOVE, $rev, "-", "-");
       } else {
-        info("remove $p (removed on server)\n");
+        if ($opts{"list"}) {
+          info("$p: local: $rev, source: <absent> (auto-remove)\n");
+        } else {
+          info("[$currnr/$totalnr] auto-remove: $p\n");
+        }
       }
+      $currnr++;
     }
     # we only remove packages when update --all is called, not on single
     # package updates
@@ -1667,7 +1677,7 @@ sub action_update {
       if ($::machinereadable) {
         machine_line($pkg, $FLAG_UPDATE, $rev, $mediarev, $sizes{$pkg});
       } else {
-        info("$pkg: local: $rev, source: $mediarev\n");
+        info("$pkg: local: $rev, source: $mediarev (update)\n");
       }
       next;
     }