summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-08-16 21:40:24 +0000
committerKarl Berry <karl@freefriends.org>2009-08-16 21:40:24 +0000
commitc75b48308a7e207abcd2cd546217dc9c48278c53 (patch)
tree3907ad7eb81bfd6447934a1ab2891e193f15e5ec
parent962e9c8bfbce54aed035baf769b508d62d4f2fd3 (diff)
from Norbert: list sizes for new packages in
machine-readable, fix for "foobar mentioned but neither new nor forcibly removed" git-svn-id: svn://tug.org/texlive/trunk@14708 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl15
1 files changed, 10 insertions, 5 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index af672f8aa99..372e4279f06 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1538,15 +1538,20 @@ sub action_update {
# A \ B set of packages removed on the server
# A \cup B set of packages which should be checked for forcible removal
#
- my @schms = ();
+ my @schmscolls = ();
for my $p ($localtlpdb->schemes) {
- push @schms, $p
+ push @schmscolls, $p
+ if defined($tlmediatlpdb->get_package($p));
+ }
+ for my $p ($localtlpdb->collections) {
+ push @schmscolls, $p
if defined($tlmediatlpdb->get_package($p));
}
my @localexpansion =
- $localtlpdb->expand_dependencies($localtlpdb, @schms);
+ $localtlpdb->expand_dependencies($localtlpdb, @schmscolls);
my @remoteexpansion =
- $tlmediatlpdb->expand_dependencies($localtlpdb, @schms);
+ $tlmediatlpdb->expand_dependencies($localtlpdb, @schmscolls);
+
for my $p (@remoteexpansion) {
$newpkgs{$p} = 1;
}
@@ -1709,7 +1714,7 @@ sub action_update {
my @foo = keys %removals;
$totalnr += $#foo + 1;
}
- if (!$opts{"no-auto-install"} && $opts{"all"}) {
+ if (!$opts{"no-auto-install"} && ( $opts{"all"} || $opts{"list"} ) ) {
$totalnr += $#new + 1;
push @alltodo, @new;
}