diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-09-03 00:49:10 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-03 00:49:10 -0700 |
| commit | 78f9a904ff356e2765a7a4e9f8eb3ad19e10846e (patch) | |
| tree | c32c49cfb7ed342cd573d1fa0ee7f3306b941557 /bin | |
| parent | Add a "Delayed Evaluation of Disjunctive Dependency Choices" section (diff) | |
| download | portage-78f9a904ff356e2765a7a4e9f8eb3ad19e10846e.tar.gz portage-78f9a904ff356e2765a7a4e9f8eb3ad19e10846e.tar.bz2 portage-78f9a904ff356e2765a7a4e9f8eb3ad19e10846e.zip | |
Fix VDB_PATH handling in ebuild(1) to join with EROOT.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild | 4 |
1 files changed, 2 insertions, 2 deletions
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) |