From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 15 Feb 2009 05:10:29 +0000 (-0000)
Subject: Fix more false positives in isvalidatom() from previous commits.
X-Git-Tag: v2.2_rc24~189
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=95ae806152673f2e55f6b41b99216e54cc87e2a2;p=portage.git

Fix more false positives in isvalidatom() from previous commits.

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

diff --git a/pym/portage/dep.py b/pym/portage/dep.py
index bde7f9c2e..831a8a324 100644
--- a/pym/portage/dep.py
+++ b/pym/portage/dep.py
@@ -782,6 +782,7 @@ def isvalidatom(atom, allow_blockers=False):
 
 	cpv = dep_getcpv(atom)
 	cpv_catsplit = catsplit(cpv)
+	without_slot = remove_slot(atom)
 	mycpv_cps = None
 	if cpv:
 		if len(cpv_catsplit) == 2:
@@ -795,12 +796,12 @@ def isvalidatom(atom, allow_blockers=False):
 					mycpv_cps[0] = "null"
 		if not mycpv_cps:
 			mycpv_cps = catpkgsplit(cpv)
-		if mycpv_cps is None and cpv != atom:
+		if mycpv_cps is None and cpv != without_slot:
 			return 0
 
 	operator = get_operator(atom)
 	if operator:
-		if operator[0] in "<>" and remove_slot(atom).endswith("*"):
+		if operator[0] in "<>" and without_slot[-1:] == "*":
 			return 0
 		if mycpv_cps:
 			if len(cpv_catsplit) == 2: