diff options
Diffstat (limited to 'pym/portage.py')
| -rw-r--r-- | pym/portage.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pym/portage.py b/pym/portage.py index d2edcf0f1..4b3df78eb 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -6814,9 +6814,6 @@ def close_portdbapi_caches(): class portdbapi(dbapi): """this tree will scan a portage directory located at root (passed to init)""" portdbapi_instances = [] - _non_category_dirs = ["distfiles", "eclass", "licenses", - "local", "metadata", "packages", "profiles", "scripts"] - _non_category_dirs = re.compile(r'^(%s)$' % "|".join(_non_category_dirs)) def __init__(self,porttree_root,mysettings=None): portdbapi.portdbapi_instances.append(self) @@ -6825,6 +6822,7 @@ class portdbapi(dbapi): else: global 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 @@ -7268,11 +7266,8 @@ class portdbapi(dbapi): def cp_all(self): "returns a list of all keys in our tree" d={} - for oroot in self.porttrees: - for x in listdir(oroot, EmptyOnError=1, ignorecvs=1, dirsonly=1): - if not self._category_re.match(x) or \ - self._non_category_dirs.match(x): - continue + for x in self.mysettings.categories: + for oroot in self.porttrees: for y in listdir(oroot+"/"+x, EmptyOnError=1, ignorecvs=1, dirsonly=1): if not self._pkg_dir_name_re.match(y) or \ y == "CVS": @@ -7302,7 +7297,7 @@ class portdbapi(dbapi): self.xcache["match-all"][mycp] = cachelist return cachelist[:] mysplit = mycp.split("/") - invalid_category = not self._category_re.match(mysplit[0]) + invalid_category = mysplit[0] not in self._categories d={} if mytree: mytrees = [mytree] |