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 1R3LSB-00057G-NN for garchives@archives.gentoo.org; Tue, 13 Sep 2011 05:22:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2DF721C067; Tue, 13 Sep 2011 05:22:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8D74B21C067 for ; Tue, 13 Sep 2011 05:22:31 +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 086E01B4010 for ; Tue, 13 Sep 2011 05:22:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 32E4980042 for ; Tue, 13 Sep 2011 05:22:30 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c646a13990bc1267ab5f557d72f3c02c08be82ad Date: Tue, 13 Sep 2011 05:22:30 +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: eb1ca28f6b0bc091e7a18842ae3b3fc3 commit: c646a13990bc1267ab5f557d72f3c02c08be82ad Author: Zac Medico gentoo org> AuthorDate: Tue Sep 13 05:22:09 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Sep 13 05:22:09 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dc646a139 ebuild(1): remove unneeded porttrees modification This code should be unnecessary, as long as the repo is correctly identified for all calls to portdbapi methods like aux_get and findname. Notably, config.setcpv() must be called with a Package instance in order to ensure that it gets the metadata from the correct repository. --- bin/ebuild | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/bin/ebuild b/bin/ebuild index 1408dd3..95f4e15 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -153,14 +153,9 @@ if ebuild_portdir !=3D vdb_path and \ print("Appending %s to PORTDIR_OVERLAY..." % ebuild_portdir) imp.reload(portage) =20 -# Constrain eclass resolution to the master(s) -# that are specified in layout.conf (using an -# approach similar to repoman's). myrepo =3D None if ebuild_portdir !=3D vdb_path: myrepo =3D portage.portdb.getRepositoryName(ebuild_portdir) - repo_info =3D portage.portdb._repo_info[ebuild_portdir] - portage.portdb.porttrees =3D list(repo_info.eclass_db.porttrees) =20 if not os.path.exists(ebuild): print("'%s' does not exist." % ebuild) @@ -282,7 +277,10 @@ pkg =3D Package(built=3D(pkg_type !=3D "ebuild"), cp= v=3Dcpv, =20 # Apply package.env and repo-level settings. This allows per-package # FEATURES and other variables (possibly PORTAGE_TMPDIR) to be -# available as soon as possible. +# available as soon as possible. Also, note that the only way to ensure +# that setcpv gets metadata from the correct repository is to pass in +# a Package instance, as we do here (previously we had to modify +# portdb.porttrees in order to accomplish this). tmpsettings.setcpv(pkg) =20 def stale_env_warning():