From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 29 May 2007 20:36:40 +0000 (-0000)
Subject: Fix get_operator() and best_match_to_list() so that slot deps mesh properly with... 
X-Git-Tag: v2.2_pre1~1342
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=73d7834ad6d013e72f93df96305993e6c04cd81a;p=portage.git

Fix get_operator() and best_match_to_list() so that slot deps mesh properly with operators.

svn path=/main/trunk/; revision=6663
---

diff --git a/pym/portage/dep.py b/pym/portage/dep.py
index 134e53bde..1252b5d26 100644
--- a/pym/portage/dep.py
+++ b/pym/portage/dep.py
@@ -322,6 +322,8 @@ def get_operator(mydep):
 	@return: The operator. One of:
 		'~', '=', '>', '<', '=*', '>=', or '<='
 	"""
+	if mydep:
+		mydep = remove_slot(mydep)
 	if mydep[0] == "~":
 		operator = "~"
 	elif mydep[0] == "=":
@@ -601,7 +603,6 @@ def best_match_to_list(mypkg, mylist):
 			if maxvalue < 3:
 				maxvalue = 3
 				bestm = x
-			continue
 		op_val = operator_values[get_operator(x)]
 		if op_val > maxvalue:
 			maxvalue = op_val