From: Jason Stubbs <jstubbs@gentoo.org>
Date: Mon, 3 Oct 2005 13:33:14 +0000 (-0000)
Subject: Warn and ignore on invalid system/world atoms
X-Git-Tag: v2.0.53_rc4_2111~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d8396b3457c86b78cab14244d56d2a91b0ae03c1;p=portage.git

Warn and ignore on invalid system/world atoms

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

diff --git a/bin/emerge b/bin/emerge
index b70c5312a..a89dab786 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -860,6 +860,9 @@ def getlist(mode):
 			if myline[0]!="*":
 				continue
 			myline=myline[1:]
+		if not portage.isvalidatom(myline):
+			print "!!! Invalid atom '%s' in your '%s' file" % (myline, mode)
+			continue
 		mynewlines.append(myline.strip())
 
 	# Remove everything that is package.provided from our list