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 1QlRMY-0000aR-Hp for garchives@archives.gentoo.org; Mon, 25 Jul 2011 20:02:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DD5121C20E for ; Mon, 25 Jul 2011 20:02:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 340A121C0B3 for ; Mon, 25 Jul 2011 19:06: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 B21021BC013 for ; Mon, 25 Jul 2011 19:06:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 81B0980042 for ; Mon, 25 Jul 2011 19:06:36 +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/pkgcorepm/ X-VCS-Repository: proj/gentoopm X-VCS-Files: gentoopm/pkgcorepm/depend.py gentoopm/pkgcorepm/pkg.py X-VCS-Directories: gentoopm/pkgcorepm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: bfdcf993f4fb3cbaf8acd4a779b0404ca96cadc7 Date: Mon, 25 Jul 2011 19:06:36 +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: 527fdd68e2e4e6f5b217ec5f160d7a65 commit: bfdcf993f4fb3cbaf8acd4a779b0404ca96cadc7 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Mon Jul 25 19:07:30 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Mon Jul 25 19:07:30 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3Dbfdcf993 pkgcore: support getting deps. --- gentoopm/pkgcorepm/depend.py | 39 ++++++++++++++++++++++++++++++++++++= +++ gentoopm/pkgcorepm/pkg.py | 16 ++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/gentoopm/pkgcorepm/depend.py b/gentoopm/pkgcorepm/depend.py new file mode 100644 index 0000000..80d697b --- /dev/null +++ b/gentoopm/pkgcorepm/depend.py @@ -0,0 +1,39 @@ +#!/usr/bin/python +# vim:fileencoding=3Dutf-8 +# (c) 2011 Micha=C5=82 G=C3=B3rny +# Released under the terms of the 2-clause BSD license. + +from pkgcore.ebuild.atom import atom +from pkgcore.restrictions.boolean import OrRestriction + +from gentoopm.basepm.depend import PMPackageDepSet, PMPackageFinalDepSet +from gentoopm.pkgcorepm.atom import PkgCoreAtom + +class PkgCorePackageDepSet(PMPackageDepSet): + def __init__(self, deps, pkg): + self._deps =3D deps + self._pkg =3D pkg + + @property + def evaluated(self): + return PkgCorePackageFinalDepSet( + self._deps.evaluate_depset(self._pkg.use)) + +class PkgCorePackageFinalDepSet(PMPackageFinalDepSet): + def __init__(self, deps): + self._deps =3D deps + + def _iter_deps(self, deps): + for d in deps: + if isinstance(d, atom): + yield d + elif isinstance(d, OrRestriction): + for d in self._iter_deps((next(iter(d)),)): # XXX + yield d + else: + raise NotImplementedError('Parsing %s not implemented' \ + % repr(d)) + + def __iter__(self): + for d in self._iter_deps(self._deps): + yield PkgCoreAtom(d) diff --git a/gentoopm/pkgcorepm/pkg.py b/gentoopm/pkgcorepm/pkg.py index dff02ed..d50d0fe 100644 --- a/gentoopm/pkgcorepm/pkg.py +++ b/gentoopm/pkgcorepm/pkg.py @@ -10,6 +10,7 @@ from gentoopm.basepm.pkg import PMPackage, PMPackageDes= cription, \ from gentoopm.basepm.pkgset import PMPackageSet, PMFilteredPackageSet from gentoopm.pkgcorepm.atom import PkgCoreAtom, PkgCorePackageKey from gentoopm.pkgcorepm.contents import PkgCorePackageContents +from gentoopm.pkgcorepm.depend import PkgCorePackageDepSet from gentoopm.util import SpaceSepTuple =20 class PkgCorePackageSet(PMPackageSet): @@ -85,6 +86,21 @@ class PkgCorePackage(PMPackage, PkgCoreAtom): def repository(self): return self._pkg.repo.repo_id =20 + @property + def build_dependencies(self): + return PkgCorePackageDepSet(self._pkg.depends, + self._pkg) + + @property + def run_dependencies(self): + return PkgCorePackageDepSet(self._pkg.rdepends, + self._pkg) + + @property + def post_dependencies(self): + return PkgCorePackageDepSet(self._pkg.pdepends, + self._pkg) + def __str__(self): if self._repo_index !=3D 0: s =3D '%s::%s' % (self._pkg.cpvstr, self._pkg.repo.repo_id)