From 3965d631ca4bc7f8843c13784fa0679af33d0c21 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 27 Sep 2007 15:11:49 +0000
Subject: fix previous commit

---
 URPM/Resolve.pm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 04f9570..d8eca12 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -1028,10 +1028,9 @@ sub _handle_diff_provides {
 	    my @best;
 	    foreach (@l) {
 		my @packages = find_candidate_packages_($urpm, $_, $state->{rejected});
-		$best = join('|', map { $_->id }
-			          grep { $_->fullname ne $p->fullname }
-				  @packages);
-		$best and push @best, $best;
+		if (@packages = grep { $_->fullname ne $p->fullname } @packages) {
+		    push @best, join('|', map { $_->id } @packages);
+		}
 	    }
 
 	    if (@best == @l) {
-- 
cgit v1.2.1