From: Jason Stubbs <jstubbs@gentoo.org>
Date: Sat, 1 Oct 2005 15:29:44 +0000 (-0000)
Subject: Restore full range of possible atoms that can be given to emerge by doing
X-Git-Tag: v2.0.53_rc4_2111~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=15ba58355f705f2db47a8b42eabeb5927e7f643b;p=portage.git

Restore full range of possible atoms that can be given to emerge by doing
atom validity checks using a dummy category if necessary.

svn path=/main/branches/2.0/; revision=2068
---

diff --git a/bin/emerge b/bin/emerge
index 5341fbcbf..daa6c8351 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1083,7 +1083,14 @@ class depgraph:
 				elif not "--oneshot" in myopts:
 					myfavorites.append(mykey)
 			else:
-				if not portage.isvalidatom(x) and not portage.isvalidatom("cat/"+x):
+				testkey = portage.dep_getkey(x)
+				if testkey.startswith("null/"):
+					testatom = x.replace(testkey[5:], "cat/"+testkey[5:])
+				elif "/" not in x:
+					testatom = "cat/"+x
+				else:
+					testatom = x
+				if not portage.isvalidatom(testatom):
 					print ("\n\n!!! '%s' is not a valid package atom." % x)
 					print "!!! Please check ebuild(5) for full details."
 					print "!!! (Did you specify a version but forget to prefix with '='?)"