From 262f4e757d4548bd54a14764c642dc3f906a2744 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Wed, 11 Jun 2003 11:34:05 +0000 Subject: 0.90-9mdk --- URPM/Resolve.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'URPM') diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 27a881d..948e801 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -158,8 +158,8 @@ sub unsatisfied_requires { #- check on selected package if a provide is satisfying the resolution (need to do the ops). foreach (keys %{$urpm->{provides}{$n} || {}}) { - exists $state->{selected}{$_} or next; my $p = $urpm->{depslist}[$_]; + $p->flag_selected || exists $state->{selected}{$_} or next; if ($urpm->{provides}{$n}{$_}) { #- sense information are used, this means we have to examine carrefully the provides. foreach ($p->provides) { @@ -623,6 +623,11 @@ sub disable_selected { } } + #- the package being examined has to be unselected. + $pkg->set_flag_requested(0); + $pkg->set_flag_required(0); + delete $state->{selected}{$pkg->id}; + #- determine package that requires properties no more available, so that they need to be #- unselected too. foreach my $n ($pkg->provides_nosense) { @@ -636,11 +641,6 @@ sub disable_selected { } } - #- the package being examined has to be unselected. - $pkg->set_flag_requested(0); - $pkg->set_flag_required(0); - delete $state->{selected}{$pkg->id}; - #- clean whatrequires hash. foreach ($pkg->requires_nosense) { delete $state->{whatrequires}{$_}{$pkg->id}; -- cgit v1.2.1