From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 2 Mar 2010 19:51:33 +0000 (-0000)
Subject: Validate categories. (trunk r15305)
X-Git-Tag: v2.1.8~182
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=14aad2db40fbbe7abc97384e59f6fda7c0a3f003;p=portage.git

Validate categories. (trunk r15305)

svn path=/main/branches/2.1.7/; revision=15540
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 8f4ef455b..8aece25b9 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2102,7 +2102,8 @@ class config(object):
 			#getting categories from an external file now
 			categories = [grabfile(os.path.join(x, "categories")) for x in locations]
 			self.categories = tuple(sorted(
-				stack_lists(categories, incremental=1)))
+				x for x in stack_lists(categories, incremental=1)
+				if dbapi._category_re.match(x) is not None))
 			del categories
 
 			archlist = [grabfile(os.path.join(x, "arch.list")) for x in locations]