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

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

diff --git a/pym/portage/dep.py b/pym/portage/dep.py
index 134e53bde79b27757c60909f823a9377dee4cfe2..1252b5d2680fe5f9212664ad818eef244a42b1d1 100644 (file)
--- 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