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

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

diff --git a/pym/portage_dep.py b/pym/portage_dep.py
index de25866057e6013abd433fde54a7330e476529f4..ec590f20f03ddbbe9e0a0e40ff18f3ee33b835c0 100644 (file)
--- 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