summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-09-07 03:39:17 +0200
committerPascal Terjan <pterjan@gmail.com>2014-10-20 21:29:56 +0000
commit36c261c39286e18594a30df226db953419a5689b (patch)
treecf1a2174382fa48c755abe1a3818f122c29dbd5f
parent62260bdb28c7f22549bb2a2a610b8d6f76dc9444 (diff)
downloaddrakx-36c261c39286e18594a30df226db953419a5689b.tar
drakx-36c261c39286e18594a30df226db953419a5689b.tar.gz
drakx-36c261c39286e18594a30df226db953419a5689b.tar.bz2
drakx-36c261c39286e18594a30df226db953419a5689b.tar.xz
drakx-36c261c39286e18594a30df226db953419a5689b.zip
adapt to URPM-5
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/pkgs.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 044984870..17372dd53 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- adapt to URPM-5
+
Version 16.42 - 18 September 2014
- only allow GRUB2 when booting on btrfs
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index adbf25258..3b39adcbf 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -595,7 +595,7 @@ sub computeGroupSize {
$newSelection{$id} = undef;
my $pkg = $packages->{depslist}[$id];
- my @deps = map { [ $_, keys %{$packages->{provides}{$_} || {}} ] } $pkg->requires_nosense, $pkg->suggests;
+ my @deps = map { [ $_, keys %{$packages->{provides}{$_} || {}} ] } $pkg->requires_nosense, $pkg->recommends_nosense;
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) {