From 976e6b338c9ce1701615e2faf3812db120c11a81 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 29 May 2007 12:41:41 +0000 Subject: 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 --- pym/portage_dep.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 -- cgit v1.2.3-1-g7c22