Fix dep_getcpv() so that it always properly removes the slot regardless of which...

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

diff --git a/pym/portage/dep.py b/pym/portage/dep.py
index 0bc90cc31a51cf3505b74e121197a657e4b05355..134e53bde79b27757c60909f823a9377dee4cfe2 100644 (file)
--- a/pym/portage/dep.py
+++ b/pym/portage/dep.py
@@ -359,6 +359,8 @@ def dep_getcpv(mydep):
        if retval is not None:
                return retval
        mydep_orig = mydep
+       if mydep:
+               mydep = remove_slot(mydep)
        if mydep and mydep[0] == "*":
                mydep = mydep[1:]
        if mydep and mydep[-1] == "*":
@@ -369,9 +371,6 @@ def dep_getcpv(mydep):
                mydep = mydep[2:]
        elif mydep[:1] in "=<>~":
                mydep = mydep[1:]
-       colon = mydep.rfind(":")
-       if colon != -1:
-               mydep = mydep[:colon]
        _dep_getcpv_cache[mydep_orig] = mydep
        return mydep