[gentoo-commits] proj/gentoopm:master commit in: gentoopm/pkgcorepm/

["Michał Górny" <mgorny@gentoo.org>]

commit:     af8c9393c0859f41ca3a3cca72b269bbb7d93bfd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 07:11:26 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 07:12:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=af8c9393

pkgcore: support transforming atom restrictions.

---
 gentoopm/pkgcorepm/filter.py |   22 +++++++++++++++++++++-
 gentoopm/pkgcorepm/repo.py   |    2 +-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/gentoopm/pkgcorepm/filter.py b/gentoopm/pkgcorepm/filter.py
index ad9aeca..6201637 100644
--- a/gentoopm/pkgcorepm/filter.py
+++ b/gentoopm/pkgcorepm/filter.py
@@ -3,6 +3,10 @@
 # (c) 2011 Michał Górny <mgorny@gentoo.org>
 # Released under the terms of the 2-clause BSD license.
 
+import pkgcore.restrictions.boolean as br
+
+from gentoopm.pkgcorepm.atom import PkgCoreAtom
+
 def transform_filters(args, kwargs):
 	"""
 	Transform our filters into pkgcore restrictions whenever possible. Takes
@@ -13,4 +17,20 @@ def transform_filters(args, kwargs):
 	and args & kwargs are returned unmodified.
 	"""
 
-	return (None, args, kwargs)
+	newargs = []
+	f = []
+
+	for a in args:
+		if isinstance(a, PkgCoreAtom):
+			f.append(a._r)
+		else:
+			newargs.append(a)
+
+	if not f:
+		f = None
+	elif len(f) == 1:
+		f = f[0]
+	else:
+		f = br.AndRestriction(*f)
+
+	return (f, newargs, kwargs)

diff --git a/gentoopm/pkgcorepm/repo.py b/gentoopm/pkgcorepm/repo.py
index 0a63cab..c923c69 100644
--- a/gentoopm/pkgcorepm/repo.py
+++ b/gentoopm/pkgcorepm/repo.py
@@ -45,7 +45,7 @@ class PkgCoreFilteredRepo(PkgCoreRepository):
 
 	def __iter__(self):
 		index = self._index
-		for pkg in self._repo.matches(self._filt):
+		for pkg in self._repo._repo.match(self._filt):
 			yield PkgCorePackage(pkg, index)
 
 class PkgCoreEbuildRepo(PkgCoreRepository, PMEbuildRepository):