From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 3 Sep 2010 07:49:10 +0000 (-0700)
Subject: Fix VDB_PATH handling in ebuild(1) to join with EROOT.
X-Git-Tag: v2.2_rc75~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=78f9a904ff356e2765a7a4e9f8eb3ad19e10846e;p=portage.git

Fix VDB_PATH handling in ebuild(1) to join with EROOT.
---

diff --git a/bin/ebuild b/bin/ebuild
index a419d264b..12375a55d 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -131,7 +131,7 @@ ebuild = portage.normalize_path(ebuild)
 ebuild_portdir = os.path.realpath(
 	os.path.dirname(os.path.dirname(os.path.dirname(ebuild))))
 ebuild = os.path.join(ebuild_portdir, *ebuild.split(os.path.sep)[-3:])
-vdb_path = os.path.join(portage.settings['ROOT'], VDB_PATH)
+vdb_path = os.path.join(portage.settings['EROOT'], VDB_PATH)
 
 # Make sure that portdb.findname() returns the correct ebuild.
 if ebuild_portdir != vdb_path and \
@@ -164,7 +164,7 @@ if not portage.catpkgsplit(cpv):
 	print("!!! %s does not follow correct package syntax." % (cpv))
 	sys.exit(1)
 
-if ebuild.startswith(os.path.join(portage.root, portage.const.VDB_PATH)):
+if ebuild.startswith(vdb_path):
 	mytree = "vartree"
 
 	portage_ebuild = portage.db[portage.root][mytree].dbapi.findname(cpv)