From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 29 May 2007 12:41:08 +0000 (-0000)
Subject: Fix dep_getcpv() so that it always properly removes the slot regardless of which... 
X-Git-Tag: v2.2_pre1~1343
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3948007beaa13f8d20160688d4cfddb2d453b4e1;p=portage.git

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

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

diff --git a/pym/portage/dep.py b/pym/portage/dep.py
index 0bc90cc31..134e53bde 100644
--- 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