From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 21 Dec 2007 01:23:28 +0000 (-0000)
Subject: Use regex category validation in binarytree.populate().
X-Git-Tag: v2.2_pre1~135
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9d62b7ddc03f0e3e07aafc9dd8751b163791f7fd;p=portage.git

Use regex category validation in binarytree.populate().

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

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index e950b2052..91695a456 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -494,7 +494,7 @@ class binarytree(object):
 					if mycpv in pkg_paths:
 						# All is first, so it's preferred.
 						continue
-					if not mycat:
+					if not self._category_re.match(mycat):
 						writemsg(("!!! Binary package has an " + \
 							"unrecognized category: '%s'\n") % full_path,
 							noiselevel=-1)
@@ -654,7 +654,7 @@ class binarytree(object):
 					continue
 				mycat = self.remotepkgs[mypkg]["CATEGORY"].strip()
 				fullpkg = mycat+"/"+mypkg[:-5]
-				if not mycat:
+				if not self._category_re.match(mycat):
 					writemsg(("!!! Remote binary package has an " + \
 						"unrecognized category: '%s'\n") % fullpkg,
 						noiselevel=-1)