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 1QhhcI-0001Nx-Mn for garchives@archives.gentoo.org; Fri, 15 Jul 2011 12:35:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 617A821C233; Fri, 15 Jul 2011 12:35:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2C22421C224 for ; Fri, 15 Jul 2011 12:35:00 +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 B0DF81BC0EB for ; Fri, 15 Jul 2011 12:34:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 583AB8003F for ; Fri, 15 Jul 2011 12:34:58 +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: <0dec284d21305f3e167222fdd1ca453f3ca96e32.mgorny@gentoo> Subject: [gentoo-commits] proj/gentoopm:master commit in: gentoopm/pkgcorepm/ X-VCS-Repository: proj/gentoopm X-VCS-Files: gentoopm/pkgcorepm/pkg.py X-VCS-Directories: gentoopm/pkgcorepm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0dec284d21305f3e167222fdd1ca453f3ca96e32 Date: Fri, 15 Jul 2011 12:34:58 +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: 3c7ff75b4de1b6551618872dcbf62496 commit: 0dec284d21305f3e167222fdd1ca453f3ca96e32 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Fri Jul 15 12:29:30 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Fri Jul 15 12:29:30 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3D0dec284d pkgcore: fix metadata access. Use the processed metadata instead of raw ones. --- gentoopm/pkgcorepm/pkg.py | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/gentoopm/pkgcorepm/pkg.py b/gentoopm/pkgcorepm/pkg.py index 472d92c..381eb6f 100644 --- a/gentoopm/pkgcorepm/pkg.py +++ b/gentoopm/pkgcorepm/pkg.py @@ -57,10 +57,6 @@ class PkgCoreMetadata(PMPackageMetadata): self._pkg =3D pkg =20 @property - def EAPI(self): - return self._pkg.eapi - - @property def INHERITED(self): # vdb uses INHERITED # ebuilds use _eclasses_ @@ -73,14 +69,23 @@ class PkgCoreMetadata(PMPackageMetadata): except KeyError: return '' =20 + @property + def DEPEND(self): + return str(self._pkg.depends) + + @property + def RDEPEND(self): + return str(self._pkg.rdepends) + + @property + def PDEPEND(self): + return str(self._pkg.post_rdepends) + def __getattr__(self, key): if key not in self: raise AttributeError('Unsupported metadata key: %s' % key) - try: - return self._pkg.data[key] - except KeyError: - return '' - - @property - def CATEGORY(self): - return self._pkg.category + v =3D getattr(self._pkg, key.lower()) + if isinstance(v, tuple) or isinstance(v, frozenset): + return ' '.join(v) + else: + return str(v)