dbapi: construct _pkg_str during match on-demand

1 files changed, 12 insertions, 5 deletions

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index c5ee7707b..df681152c 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -22,7 +22,8 @@ from portage.cache.cache_errors import CacheError
 from portage.cache.mappings import Mapping
 from portage.dbapi import dbapi
 from portage.exception import PortageException, \
-	FileNotFound, InvalidAtom, InvalidDependString, InvalidPackageName
+	FileNotFound, InvalidAtom, InvalidData, \
+	InvalidDependString, InvalidPackageName
 from portage.localization import _
 
 from portage import eclass_cache, \
@@ -825,18 +826,24 @@ class portdbapi(dbapi):
 						# ebuild not in this repo, or masked by corruption
 						continue
 
-					if visibility_filter and not self._visible(cpv, metadata):
+					try:
+						pkg_str = _pkg_str(cpv, slot=metadata["SLOT"],
+							repo=metadata["repository"], eapi=metadata["EAPI"])
+					except InvalidData:
+						continue
+
+					if visibility_filter and not self._visible(pkg_str, metadata):
 						continue
 
 					if mydep.slot is not None and \
-						mydep.slot != metadata["SLOT"]:
+						mydep.slot != pkg_str.slot:
 						continue
 
 					if mydep.unevaluated_atom.use is not None and \
-						not self._match_use(mydep, cpv, metadata):
+						not self._match_use(mydep, pkg_str, metadata):
 						continue
 
-					myval.append(cpv)
+					myval.append(pkg_str)
 					# only yield a given cpv once
 					break