From 0163a29466f06a90f25616cb6222ea794164dbc7 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Fri, 2 Apr 2010 14:49:40 +0000 Subject: Use all included levels to resolv dependencies instead of doing it level by level --- perl-install/install/pkgs.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'perl-install/install/pkgs.pm') diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index 2b08b2a42..9a24a6f40 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -384,11 +384,15 @@ sub setSelectedFromCompssList { $pkgs{$p->rate} ||= {}; $pkgs{$p->rate}{$p->id} = 1 if _packageRequest($packages, $p); } + my %pkgswanted = {}; foreach my $level (sort { $b <=> $a } keys %pkgs) { #- determine the packages that will be selected #- the packages are not selected. my $state = $packages->{state} ||= {}; - my ($l, $_error) = _resolve_requested_and_check($packages, $state, $pkgs{$level}); + foreach my $p (keys %{$pkgs{$level}}) { + $pkgswanted{$p} = 1; + } + my ($l, $_error) = _resolve_requested_and_check($packages, $state, \%pkgswanted); #- this enable an incremental total size. my $old_nb = $nb; -- cgit v1.2.1