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

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

svn path=/main/branches/2.1.2/; revision=6664
---

diff --git a/pym/portage_dep.py b/pym/portage_dep.py
index de2586605..ec590f20f 100644
--- a/pym/portage_dep.py
+++ b/pym/portage_dep.py
@@ -266,6 +266,8 @@ def get_operator(mydep):
 	@return: The operator. One of:
 		'~', '=', '>', '<', '=*', '>=', or '<='
 	"""
+	if mydep:
+		mydep = remove_slot(mydep)
 	if mydep[0] == "~":
 		operator = "~"
 	elif mydep[0] == "=":
@@ -515,7 +517,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