For bug #163990, warn about ebuilds with invalid categories and do not allow them...

svn path=/main/trunk/; revision=5988

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 7293b2e43bd00a9c0cf32321a7f608e284b006a8..953ffdcff349f19063447697f8c506b1d472ffb2 100644 (file)
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -32,7 +32,7 @@ class portdbapi(dbapi):
                else:
                        from portage import settings
                        self.mysettings = config(clone=settings)
-
+               self._categories = set(self.mysettings.categories)
                # This is strictly for use in aux_get() doebuild calls when metadata
                # is generated by the depend phase.  It's safest to use a clone for
                # this purpose because doebuild makes many changes to the config
@@ -478,6 +478,7 @@ class portdbapi(dbapi):
 
        def cp_list(self, mycp, use_cache=1, mytree=None):
                mysplit = mycp.split("/")
+               invalid_category = mysplit[0] not in self._categories
                d={}
                if mytree:
                        mytrees = [mytree]
@@ -493,6 +494,10 @@ class portdbapi(dbapi):
                                                        os.path.join(oroot, mycp, x), noiselevel=-1)
                                                continue
                                        d[mysplit[0]+"/"+pf] = None
+               if invalid_category and d:
+                       writemsg(("\n!!! '%s' has a category that is not listed in " + \
+                               "/etc/portage/categories\n") % mycp, noiselevel=-1)
+                       return []
                return d.keys()
 
        def freeze(self):