From 29e5d9911713307e14601e43960b51967928e4c8 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 21 Dec 2007 01:28:17 +0000 Subject: [PATCH] Use regex category validation in binarytree.populate(). (trunk r9011:9013) svn path=/main/branches/2.1.2/; revision=9014 --- pym/portage.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) -- 2.26.2