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

diff --git a/bin/ebuild b/bin/ebuild
index a419d264b8880e5117350f041a0212a287c58ef7..12375a55dd17ac571cf39a879910f0b8ea7b498c 100755 (executable)
--- 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)