summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-07-11 12:56:31 +0000
committerNorbert Preining <preining@logic.at>2009-07-11 12:56:31 +0000
commita2e7f9bdb3b015ac54ab1fe6a67ebebc53b41558 (patch)
tree9fea6f838a610230fdd17600add6bdf3cf35324b
parent060c3053d0d54ad680deac7f9b279701a9ed64d3 (diff)
tlmgr: fix small numbering error in case you update only some packages
and there are packages to be removed. Up to here it would have looked like $ tlmgr update texlive.infra --dry-run tlmgr: installation location /var/www/norbert/tlnet update: dry run, no changes will be made [2/2] update: texlive.infra (1422 -> 14221) $ which is a bit strange git-svn-id: svn://tug.org/texlive/trunk@14230 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl7
1 files changed, 5 insertions, 2 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 934a1bec6c4..2ad10cbe1b8 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1599,7 +1599,9 @@ 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"}) {
+ # we add that only to the list of total packages do be worked on
+ # when --all is given, because we remove packages only on --all
+ if (!$opts{"no-remove"} && $opts{"all"}) {
my @foo = keys %removals;
$totalnr += $#foo + 1;
}
@@ -1614,6 +1616,7 @@ sub action_update {
} else {
info("$p: local: $rev, source: <absent> (auto-remove)\n");
}
+ $currnr++;
} else {
# new we are sure that:
# - $opts{"no-remove"} is *not* set
@@ -1627,9 +1630,9 @@ sub action_update {
$localtlmedia->remove_package($p);
logpackage("remove: $p");
}
+ $currnr++;
}
}
- $currnr++;
}
}