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

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

commit:     613cc058d3955b9527ccd34879ded887137b2ecc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 07:16:05 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 07:16:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=613cc058

pkgcore: fix chaining filters.

---
 gentoopm/pkgcorepm/repo.py |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/gentoopm/pkgcorepm/repo.py b/gentoopm/pkgcorepm/repo.py
index c923c69..cd25359 100644
--- a/gentoopm/pkgcorepm/repo.py
+++ b/gentoopm/pkgcorepm/repo.py
@@ -3,6 +3,8 @@
 # (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.basepm.repo import PMRepository, PMRepositoryDict, \
 		PMEbuildRepository
 from gentoopm.pkgcorepm.pkg import PkgCorePackage
@@ -48,6 +50,18 @@ class PkgCoreFilteredRepo(PkgCoreRepository):
 		for pkg in self._repo._repo.match(self._filt):
 			yield PkgCorePackage(pkg, index)
 
+	def filter(self, *args, **kwargs):
+		r = self
+		filt, newargs, newkwargs = transform_filters(args, kwargs)
+
+		if filt:
+			r = PkgCoreFilteredRepo(self._repo,
+					br.AndRestriction(self._filt, filt))
+		if newargs or newkwargs:
+			r = PMRepository.filter(r, *args, **kwargs)
+
+		return r
+
 class PkgCoreEbuildRepo(PkgCoreRepository, PMEbuildRepository):
 	def __init__(self, repo_obj, index):
 		PkgCoreRepository.__init__(self, repo_obj)