From c15dc09471673d3517703ac522a415f130946bf9 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 5 Oct 2010 20:06:04 -0700 Subject: Fix ebuild(1) to handle layout.conf masters. --- bin/ebuild | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'bin/ebuild') diff --git a/bin/ebuild b/bin/ebuild index 12375a55d..d8ab5ef12 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -149,9 +149,12 @@ if ebuild_portdir != vdb_path and \ print("Appending %s to PORTDIR_OVERLAY..." % ebuild_portdir) portage.close_portdbapi_caches() imp.reload(portage) -del portage.portdb.porttrees[1:] -if ebuild_portdir != portage.portdb.porttree_root: - portage.portdb.porttrees.append(ebuild_portdir) + +# Constrain eclass resolution to the master(s) +# that are specified in layout.conf (using an +# approach similar to repoman's). +repo_info = portage.portdb._repo_info[ebuild_portdir] +portage.portdb.porttrees = list(repo_info.eclass_db.porttrees) if not os.path.exists(ebuild): print("'%s' does not exist." % ebuild) -- cgit v1.2.3-1-g7c22