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 /pym/portage/tests/resolver | |
| 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 'pym/portage/tests/resolver')
| -rw-r--r-- | pym/portage/tests/resolver/ResolverPlayground.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py index 4bbd03318..57cdebece 100644 --- a/pym/portage/tests/resolver/ResolverPlayground.py +++ b/pym/portage/tests/resolver/ResolverPlayground.py @@ -201,7 +201,7 @@ class ResolverPlayground(object): ebuild_dir = os.path.join(repo_dir, a.cp) ebuild_path = os.path.join(ebuild_dir, a.cpv.split("/")[1] + ".ebuild") - portdb = self.trees[self.root]["porttree"].dbapi + portdb = self.trees[self.eroot]["porttree"].dbapi tmpsettings['O'] = ebuild_dir if not digestgen(mysettings=tmpsettings, myportdb=portdb): raise AssertionError('digest creation failed for %s' % ebuild_path) @@ -549,7 +549,7 @@ class ResolverPlayground(object): return def cleanup(self): - portdb = self.trees[self.root]["porttree"].dbapi + portdb = self.trees[self.eroot]["porttree"].dbapi portdb.close_caches() portage.dbapi.porttree.portdbapi.portdbapi_instances.remove(portdb) if self.debug: |