From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 11 Jan 2008 02:03:15 +0000 (-0000)
Subject: Make sure that portdb.findname() returns the correct ebuild.
X-Git-Tag: v2.2_pre1~64
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=48226fb63daf14029f123ba43059b2513813fb8a;p=portage.git

Make sure that portdb.findname() returns the correct ebuild.

svn path=/main/trunk/; revision=9164
---

diff --git a/bin/ebuild b/bin/ebuild
index 7aebd8a36..1c4acef79 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -60,6 +60,11 @@ ebuild = portage.normalize_path(ebuild)
 ebuild_portdir = os.path.realpath(os.path.dirname(os.path.dirname(ebuild)))
 ebuild = os.path.join(ebuild_portdir, *ebuild.split(os.path.sep)[-2:])
 
+# Make sure that portdb.findname() returns the correct ebuild.
+del portage.portdb.porttrees[1:]
+if ebuild_portdir != portage.portdb.porttree_root:
+	portage.portdb.porttrees.append(ebuild_portdir)
+
 if not os.path.exists(ebuild):
 	print "'%s' does not exist." % ebuild
 	sys.exit(1)