summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-04-03 08:59:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-04-03 08:59:12 +0000
commit8064711a423236c38aa33e336a4e4e16be11a6e5 (patch)
tree1af7a40700870d348d8d5d8a8d8fbb73e4af04e4 /perl-install/install
parentad7c92529b6fecfb71087fd0433407a2428a7366 (diff)
downloaddrakx-8064711a423236c38aa33e336a4e4e16be11a6e5.tar
drakx-8064711a423236c38aa33e336a4e4e16be11a6e5.tar.gz
drakx-8064711a423236c38aa33e336a4e4e16be11a6e5.tar.bz2
drakx-8064711a423236c38aa33e336a4e4e16be11a6e5.tar.xz
drakx-8064711a423236c38aa33e336a4e4e16be11a6e5.zip
- when computed install size in group selection (#39303)
(it didn't take suggests into account)
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/pkgs.pm4
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 6ac2b1551..8d5aa8cc0 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- when computed install size in group selection (#39303)
+ (it didn't take suggests into account)
+
Version 10.27 - 3 April 2008
- 2008.1 logo (the good one)
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index f8dbd9451..1b7b671d9 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -504,8 +504,8 @@ sub computeGroupSize {
$newSelection{$id} = undef;
my $pkg = $packages->{depslist}[$id];
- my @requires = map { [ $_, keys %{$packages->{provides}{$_} || {}} ] } $pkg->requires_nosense;
- foreach (sort { @$a <=> @$b } @requires) { #- sort on number of provides (it helps choosing "b" in: "a" requires both "b" and virtual={"b","c"})
+ my @deps = map { [ $_, keys %{$packages->{provides}{$_} || {}} ] } $pkg->requires_nosense, $pkg->suggests;
+ foreach (sort { @$a <=> @$b } @deps) { #- sort on number of provides (it helps choosing "b" in: "a" requires both "b" and virtual={"b","c"})
my ($virtual, @choices) = @$_;
if (@choices <= 1) {
#- only one choice :)