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

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

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

diff --git a/pym/portage_dep.py b/pym/portage_dep.py
index 051b8a5ca..de2586605 100644
--- a/pym/portage_dep.py
+++ b/pym/portage_dep.py
@@ -303,6 +303,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] == "*":
@@ -313,9 +315,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