diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-10-25 01:59:39 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-10-25 01:59:39 -0700 |
| commit | a715b65f7bd36409c1283e6911265d1f4405ab7a (patch) | |
| tree | f3ad709ca1495be750163ced02fe11562566f910 /bin/ebuild | |
| parent | 25aaf3e69b8ef0e9a21d0d74a9b7b690b76675cd (diff) | |
| download | portage-a715b65f7bd36409c1283e6911265d1f4405ab7a.tar.gz portage-a715b65f7bd36409c1283e6911265d1f4405ab7a.tar.bz2 portage-a715b65f7bd36409c1283e6911265d1f4405ab7a.zip | |
Use EROOT instead of ROOT for keys everywhere.
It makes more sense to use EROOT instead of ROOT for keys in mappings
like portage.db, since it allows for multiple prefixes to exist
simultaneously within the same map without having a key collision.
This affects all portageq commands which take a <root> parameter, since
that parameter now corresponds to EROOT instead of ROOT. None of this
makes any difference for non-prefix users, since EROOT and ROOT are
identical when EPREFIX is empty.
Diffstat (limited to 'bin/ebuild')
| -rwxr-xr-x | bin/ebuild | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/ebuild b/bin/ebuild index 771ccb51c..82f0ff990 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -260,14 +260,14 @@ if "merge" in pargs and "noauto" in tmpsettings.features: try: metadata = dict(zip(Package.metadata_keys, - portage.db[portage.settings["ROOT"]][mytree].dbapi.aux_get( + portage.db[portage.settings['EROOT']][mytree].dbapi.aux_get( cpv, Package.metadata_keys, myrepo=myrepo))) except KeyError: # aux_get failure, message should have been shown on stderr. sys.exit(1) root_config = RootConfig(portage.settings, - portage.db[portage.settings["ROOT"]], None) + portage.db[portage.settings['EROOT']], None) pkg = Package(built=(pkg_type != "ebuild"), cpv=cpv, installed=(pkg_type=="installed"), |