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 1QfE3l-00038P-CU for garchives@archives.gentoo.org; Fri, 08 Jul 2011 16:37:45 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B4E7321C061; Fri, 8 Jul 2011 16:37:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8996421C061 for ; Fri, 8 Jul 2011 16:37:38 +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 1A0DF2AC0F6 for ; Fri, 8 Jul 2011 16:37:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 72ECD8003F for ; Fri, 8 Jul 2011 16:37:37 +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: Subject: [gentoo-commits] proj/gentoopm:master commit in: gentoopm/paludispm/ X-VCS-Repository: proj/gentoopm X-VCS-Files: gentoopm/paludispm/pkg.py gentoopm/paludispm/repo.py X-VCS-Directories: gentoopm/paludispm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b0572d4b95f033e6f1d9c360e8d60fa0828e5d8a Date: Fri, 8 Jul 2011 16:37:37 +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: 6d5388a4a5c848c42e93dcdbcc2cd143 commit: b0572d4b95f033e6f1d9c360e8d60fa0828e5d8a Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Fri Jul 8 16:38:07 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Fri Jul 8 16:38:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3Db0572d4b Paludis: don't sort if sorted already. --- gentoopm/paludispm/pkg.py | 26 +++++++++++++++++++++++++- gentoopm/paludispm/repo.py | 3 ++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/gentoopm/paludispm/pkg.py b/gentoopm/paludispm/pkg.py index 923376e..5f40984 100644 --- a/gentoopm/paludispm/pkg.py +++ b/gentoopm/paludispm/pkg.py @@ -10,11 +10,35 @@ from gentoopm.basepm.pkg import PMPackageSet, PMPacka= ge, \ PMFilteredPackageSet =20 class PaludisPackageSet(PMPackageSet): + _sorted =3D False + def filter(self, *args, **kwargs): return PaludisFilteredPackageSet(self, args, kwargs) =20 + @property + def best(self): + if self._sorted: + it =3D iter(self) + + try: + f =3D next(it) + except StopIteration: + raise TypeError('.best called on an empty set') + for p in it: + if p.key !=3D f.key: + raise KeyError('.best called on a set of differently-named packages= ') + + try: + return p + except NameError: + return f + else: + return PMPackageSet.best.fget(self) + class PaludisFilteredPackageSet(PMFilteredPackageSet, PaludisPackageSet)= : - pass + def __init__(self, pset, args, kwargs): + self._sorted =3D pset._sorted + PMFilteredPackageSet.__init__(self, pset, args, kwargs) =20 class PaludisID(PMPackage): def __init__(self, pkg, num =3D 0, enum_id =3D None): diff --git a/gentoopm/paludispm/repo.py b/gentoopm/paludispm/repo.py index 217242f..0a884fd 100644 --- a/gentoopm/paludispm/repo.py +++ b/gentoopm/paludispm/repo.py @@ -24,6 +24,7 @@ class PaludisEnumID(object): class PaludisRepository(PMRepository, PaludisPackageSet): def __init__(self, env): self._env =3D env + self._sorted =3D True =20 def __iter__(self): enum =3D PaludisEnumID() @@ -44,7 +45,7 @@ class PaludisStackRepo(PaludisRepository): =20 class PaludisLivefsRepository(PaludisRepository, PMEbuildRepository): def __init__(self, repo_obj, env): - self._env =3D env + PaludisRepository.__init__(self, env) self._repo =3D repo_obj =20 @property