From 34d2d19b79c2ed4b7ff25798645c8112c0a50140 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 28 Sep 2007 08:34:33 +0000
Subject: simplify (don't compute twice $_->fullname ne $p->fullname when we
 already know $_->name ne $p->name)

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

diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index f47b562..a2c30a4 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -1012,10 +1012,9 @@ sub _handle_diff_provides {
 	#- already installed.
 	my @packages = find_candidate_packages_($urpm, $p->name, $state->{rejected});
 	@packages = 
-	  grep { ($_->name eq $p->name ||
+	  grep { ($_->name eq $p->name ? $_->fullname ne $p->fullname :
 		    $_->obsoletes_overlap($p->name . " == " . $p->epoch . ":" . $p->version . "-" . $p->release))
-		   && $_->fullname ne $p->fullname &&
-		     unsatisfied_requires($urpm, $db, $state, $_, name => $n) == 0 }
+		   && unsatisfied_requires($urpm, $db, $state, $_, name => $n) == 0 }
 	    @packages;
 
 	if (!@packages) {
-- 
cgit v1.2.1