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 1QlRM6-0000Q6-O1 for garchives@archives.gentoo.org; Mon, 25 Jul 2011 20:02:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5549B21C183 for ; Mon, 25 Jul 2011 20:02:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 820FC21C08D for ; Mon, 25 Jul 2011 19:06:37 +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 EFA961BC022 for ; Mon, 25 Jul 2011 19:06:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 57A068003F 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/__init__.py gentoopm/pkgcorepm/repo.py X-VCS-Directories: gentoopm/pkgcorepm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a3bd4f5475fc3c78a484184a51cebc7e85d7a6d4 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: 1b669ce8becd23d813f7e27ed9bd4377 commit: a3bd4f5475fc3c78a484184a51cebc7e85d7a6d4 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Mon Jul 25 18:48:52 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Mon Jul 25 18:48:52 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3Da3bd4f54 pkgcore: use configured trees. --- gentoopm/pkgcorepm/__init__.py | 6 ++++-- gentoopm/pkgcorepm/repo.py | 14 ++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/gentoopm/pkgcorepm/__init__.py b/gentoopm/pkgcorepm/__init__= .py index 10a5390..b31e80f 100644 --- a/gentoopm/pkgcorepm/__init__.py +++ b/gentoopm/pkgcorepm/__init__.py @@ -20,11 +20,13 @@ class PkgCorePM(PackageManager): =20 @property def repositories(self): - return PkgCoreRepoDict(self._domain.named_repos['repo-stack']) + return PkgCoreRepoDict(self._domain.named_repos['repo-stack'], + self._domain) =20 @property def installed(self): - return PkgCoreInstalledRepo(self._domain.named_repos['vdb']) + return PkgCoreInstalledRepo(self._domain.named_repos['vdb'], + self._domain) =20 @property def Atom(self): diff --git a/gentoopm/pkgcorepm/repo.py b/gentoopm/pkgcorepm/repo.py index 095d89e..c11b01e 100644 --- a/gentoopm/pkgcorepm/repo.py +++ b/gentoopm/pkgcorepm/repo.py @@ -17,15 +17,17 @@ from gentoopm.util import FillMissingComparisons class PkgCoreRepoDict(PMRepositoryDict): def __iter__(self): for i, r in enumerate(self._stack.trees): - yield PkgCoreEbuildRepo(r, i) + yield PkgCoreEbuildRepo(r, self._domain, i) =20 - def __init__(self, stack): + def __init__(self, stack, domain): self._stack =3D stack + self._domain =3D domain =20 class PkgCoreRepository(PkgCorePackageSet, PMRepository): _index =3D 0 - def __init__(self, repo_obj): - self._repo =3D repo_obj + def __init__(self, repo_obj, domain): + self._repo =3D repo_obj.configure(repo_obj, domain, + domain.settings) =20 @abstractproperty def _pkg_class(self): @@ -79,8 +81,8 @@ class PkgCoreEbuildRepo(PkgCoreRepository, PMEbuildRepo= sitory, =20 _pkg_class =3D PkgCoreInstallablePackage =20 - def __init__(self, repo_obj, index): - PkgCoreRepository.__init__(self, repo_obj) + def __init__(self, repo_obj, domain, index): + PkgCoreRepository.__init__(self, repo_obj, domain) self._index =3D index =20 @property