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

Use regex category validation in binarytree.populate().
(trunk r9011:9013)

svn path=/main/branches/2.1.2/; revision=9014
---

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