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 1Qn5RN-0005Ek-Jv for garchives@archives.gentoo.org; Sat, 30 Jul 2011 09:02:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2FDE921C183 for ; Sat, 30 Jul 2011 09:02:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6A93521C0C2 for ; Sat, 30 Jul 2011 08:13:34 +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 CFDDB1B4012 for ; Sat, 30 Jul 2011 08:13:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 150218003D for ; Sat, 30 Jul 2011 08:13:33 +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: <47fd2cbc28005be9fdf9707c2f64dd659a2b44a0.mgorny@gentoo> Subject: [gentoo-commits] proj/gentoopm:master commit in: gentoopm/portagepm/, gentoopm/pkgcorepm/, gentoopm/paludispm/, gentoopm/basepm/ X-VCS-Repository: proj/gentoopm X-VCS-Files: gentoopm/basepm/pkg.py gentoopm/paludispm/pkg.py gentoopm/pkgcorepm/pkg.py gentoopm/portagepm/pkg.py X-VCS-Directories: gentoopm/portagepm/ gentoopm/pkgcorepm/ gentoopm/paludispm/ gentoopm/basepm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 47fd2cbc28005be9fdf9707c2f64dd659a2b44a0 Date: Sat, 30 Jul 2011 08:13:33 +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: f93739adcacf94e6daeb8c656738c5fc commit: 47fd2cbc28005be9fdf9707c2f64dd659a2b44a0 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Sat Jul 30 08:14:05 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Sat Jul 30 08:14:05 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3D47fd2cbc Support checking whether a USEflag is enabled. --- gentoopm/basepm/pkg.py | 11 ++++++++++- gentoopm/paludispm/pkg.py | 4 ++++ gentoopm/pkgcorepm/pkg.py | 19 +++++++++++++++++-- gentoopm/portagepm/pkg.py | 21 ++++++++++++++++++--- 4 files changed, 49 insertions(+), 6 deletions(-) diff --git a/gentoopm/basepm/pkg.py b/gentoopm/basepm/pkg.py index efb80e7..b2e7581 100644 --- a/gentoopm/basepm/pkg.py +++ b/gentoopm/basepm/pkg.py @@ -93,6 +93,15 @@ class PMUseFlag(ABCObject, StringCompat): """ return self._name =20 + @abstractproperty + def enabled(self): + """ + Whether the flag is enabled. + + @type: bool + """ + pass + def __str__(self): return self.name =20 @@ -298,7 +307,7 @@ class PMPackage(PMAtom, FillMissingComparisons): @abstractproperty def use(self): """ - Get the list of USE flags declared in the ebuild (C{IUSE}). + Get the list of USE flags applying to the ebuild. =20 @type: L{SpaceSepFrozenSet}(L{PMUseFlag}) """ diff --git a/gentoopm/paludispm/pkg.py b/gentoopm/paludispm/pkg.py index 0c5d567..7a9b244 100644 --- a/gentoopm/paludispm/pkg.py +++ b/gentoopm/paludispm/pkg.py @@ -48,6 +48,10 @@ class PaludisChoice(PMUseFlag): def name(self): return str(self._c.name_with_prefix) =20 + @property + def enabled(self): + return self._c.enabled + class PaludisChoiceSet(SpaceSepFrozenSet): def __new__(self, choices): l =3D [] diff --git a/gentoopm/pkgcorepm/pkg.py b/gentoopm/pkgcorepm/pkg.py index da81888..757bc90 100644 --- a/gentoopm/pkgcorepm/pkg.py +++ b/gentoopm/pkgcorepm/pkg.py @@ -46,7 +46,22 @@ class PkgCorePackageDescription(PMPackageDescription): return None =20 class PkgCoreUseFlag(PMUseFlag): - pass + def __init__(self, s, enabled_use): + PMUseFlag.__init__(self, s) + self._enabled =3D self.name in enabled_use + + @property + def enabled(self): + return self._enabled + +class PkgCoreUseSet(SpaceSepFrozenSet): + def __new__(self, iuse, use): + def _get_iuse(): + for u in iuse: + yield PkgCoreUseFlag(u, use) + + self._use =3D use + return SpaceSepFrozenSet.__new__(self, _get_iuse()) =20 class PkgCorePackage(PMPackage, PkgCoreAtom): def __init__(self, pkg, repo_index =3D 0): @@ -87,7 +102,7 @@ class PkgCorePackage(PMPackage, PkgCoreAtom): =20 @property def use(self): - return SpaceSepFrozenSet([PkgCoreUseFlag(x) for x in self._pkg.iuse]) + return PkgCoreUseSet(self._pkg.iuse, self._pkg.use) =20 @property def slotted(self): diff --git a/gentoopm/portagepm/pkg.py b/gentoopm/portagepm/pkg.py index 9653262..9ced5ec 100644 --- a/gentoopm/portagepm/pkg.py +++ b/gentoopm/portagepm/pkg.py @@ -57,7 +57,22 @@ class PortagePackageDescription(PMPackageDescription): return None # XXX =20 class PortageUseFlag(PMUseFlag): - pass + def __init__(self, s, enabled_use): + PMUseFlag.__init__(self, s) + self._enabled =3D self.name in enabled_use + + @property + def enabled(self): + return self._enabled + +class PortageUseSet(SpaceSepFrozenSet): + def __new__(self, iuse, use): + def _get_iuse(): + for u in iuse: + yield PortageUseFlag(u, use) + + self._use =3D use + return SpaceSepFrozenSet.__new__(self, _get_iuse()) =20 class PortageDBCPV(PMPackage, CompletePortageAtom): def __init__(self, cpv, dbapi): @@ -126,8 +141,8 @@ class PortageDBCPV(PMPackage, CompletePortageAtom): =20 @property def use(self): - return SpaceSepFrozenSet([PortageUseFlag(x) for x \ - in self._aux_get('IUSE').split()]) + return PortageUseSet(self._aux_get('IUSE').split(), + self._applied_use) =20 @property def slotted(self):