From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QfIFN-0001zg-Q5 for garchives@archives.gentoo.org; Fri, 08 Jul 2011 21:06:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 128E321C0A6; Fri, 8 Jul 2011 21:05:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D966121C0A6 for ; Fri, 8 Jul 2011 21:05:54 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66ED42AC10A for ; Fri, 8 Jul 2011 21:05:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C09FE8003F for ; Fri, 8 Jul 2011 21:05:53 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <87eed3cc74ea06f0b6cb4cf2ebb18b27ee508e6f.mgorny@gentoo> Subject: [gentoo-commits] proj/gentoopm:master commit in: gentoopm/paludispm/ X-VCS-Repository: proj/gentoopm X-VCS-Files: gentoopm/paludispm/repo.py X-VCS-Directories: gentoopm/paludispm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 87eed3cc74ea06f0b6cb4cf2ebb18b27ee508e6f Date: Fri, 8 Jul 2011 21:05:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 2916ad0b95458c2ee8e834d5704a6878 commit: 87eed3cc74ea06f0b6cb4cf2ebb18b27ee508e6f Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Fri Jul 8 21:00:18 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Fri Jul 8 21:00:18 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3D87eed3cc Paludis: support atom matching. --- gentoopm/paludispm/repo.py | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/gentoopm/paludispm/repo.py b/gentoopm/paludispm/repo.py index 01f57a8..caa29e8 100644 --- a/gentoopm/paludispm/repo.py +++ b/gentoopm/paludispm/repo.py @@ -40,6 +40,38 @@ class PaludisRepository(PMRepository, PaludisPackageSe= t): paludis.FilteredGenerator(self._gen, self._filt))]): yield PaludisID(p, i, enum) =20 + def filter(self, *args, **kwargs): + pset =3D self + newargs =3D [] + + for f in args: + if not callable(f): # an atom! + pset =3D PaludisAtomFilteredRepo(pset, f) + else: + newargs.append(f) + + if pset =3D=3D self: + return PaludisPackageSet.filter(self, args, kwargs) + elif newargs or kwargs: + return pset.filter(self, newargs, kwargs) + else: + return pset + +class PaludisAtomFilteredRepo(PaludisRepository): + @property + def _gen(self): + return self._mygen + + @property + def _filt(self): + return self._myfilt + + def __init__(self, repo, atom): + PaludisRepository.__init__(self, repo._env) + self._myfilt =3D repo._filt + self._mygen =3D repo._gen & paludis.Generator.Matches(atom._atom, + paludis.MatchPackageOptions()) + class PaludisStackRepo(PaludisRepository): @property def _gen(self):