summaryrefslogtreecommitdiff
path: root/Master/texmf
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-06-11 16:52:14 +0000
committerNorbert Preining <preining@logic.at>2009-06-11 16:52:14 +0000
commitde4187390822bbf15e660fee287392de8768198b (patch)
tree89c78916bccbb991f1388b1ff7b7ab476e3b59f8 /Master/texmf
parentcd60ab2107388fe9e652ad746abddb766d2aff34 (diff)
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
Diffstat (limited to 'Master/texmf')
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl16
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;
}