From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 13 Jan 2007 08:54:35 +0000 (-0000)
Subject: Catch InvalidData exceptions for bad atoms passed as emerge arguments.
X-Git-Tag: v2.1.2~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df6bb77f8e66cd1ead7f9f27583ff4e7cae60c85;p=portage.git

Catch InvalidData exceptions for bad atoms passed as emerge arguments.

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

diff --git a/bin/emerge b/bin/emerge
index e73e5e40c..317ae4ef9 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3578,7 +3578,10 @@ def chk_updated_cfg_files(target_root, config_protect):
 		print
 
 def is_valid_package_atom(x):
-	testkey = portage.dep_getkey(x)
+	try:
+		testkey = portage.dep_getkey(x)
+	except portage_exception.InvalidData:
+		return False
 	if testkey.startswith("null/"):
 		testatom = x.replace(testkey[5:], "cat/"+testkey[5:])
 	elif "/" not in x: