From 4a2697eb846739d81ae19d66afe908fdad246fbc Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Fri, 9 Aug 2002 17:12:44 +0000 Subject: 0.60-5mdk --- URPM/Resolve.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'URPM') diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 4f4207e..fdac138 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -649,11 +649,11 @@ sub request_packages_to_upgrade { } #- examine all packages which may be conflicting, it a package conflicts, it should not be requested. - my @names = keys %names; + my @names = map { $_->name." == ".$_->epoch.":".$_->version."-".$_->release } values %names; my @pkgs = values %names; foreach my $pkg (@pkgs) { foreach my $conflict ($pkg->conflicts) { - delete @names{grep { ranges_overlap($conflict, $_) } @names}; + delete @names{map { /(\S*)/ && $1 } grep { ranges_overlap($conflict, $_) } @names}; } } -- cgit v1.2.1