diff options
| -rw-r--r-- | URPM/Resolve.pm | 5 | ||||
| -rw-r--r-- | perl-URPM.spec | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index a7e7f25..ccdf64c 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -20,7 +20,7 @@ sub find_candidate_packages { #- check if at least one provide of the package overlap the property. my $satisfied = 0; foreach ($pkg->provides) { - ranges_overlap($property, $_) and ++$satisfied, last; + ranges_overlap($_, $property) and ++$satisfied, last; } $satisfied and push @{$packages{$pkg->name}}, $pkg; } @@ -137,7 +137,8 @@ sub resolve_requested { @chosen = values %$packages; } if (!$pkg && $options{callback_choices} && @chosen > 1) { - $pkg ||= $options{callback_choices}->($urpm, $db, $state, \@chosen); + $pkg = $options{callback_choices}->($urpm, $db, $state, \@chosen); + $pkg or next; #- callback may decide to not continue (or state is already updated). } $pkg ||= $chosen[0]; $pkg && !$pkg->flag_requested && !$pkg->flag_required or next; diff --git a/perl-URPM.spec b/perl-URPM.spec index 29ee9f8..b1dbd6d 100644 --- a/perl-URPM.spec +++ b/perl-URPM.spec @@ -1,7 +1,7 @@ %define name perl-URPM %define real_name URPM %define version 0.04 -%define release 5mdk +%define release 6mdk %{expand:%%define rpm_version %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' rpm)} @@ -48,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 26 2002 François Pons <fpons@mandrakesoft.com> 0.04-6mdk +- fixed work around of rpmlib where provides should be at + left position of rpmRangesOverlap. + * Tue Jun 18 2002 François Pons <fpons@mandrakesoft.com> 0.04-5mdk - fixed wrong range overlap evaluation (libgcc >= 3.1 and libgcc.so.1). |