create_trees: add public eprefix parameter

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 5a1866ff126dab97b20de2a4c49f71ea59396366..1df956633c6c95d03b3f70e2f9b042575621b8d9 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -486,7 +486,8 @@ class _trees_dict(dict):
                self._running_eroot = None
                self._target_eroot = None
 
-def create_trees(config_root=None, target_root=None, trees=None, env=None):
+def create_trees(config_root=None, target_root=None, trees=None, env=None,
+       eprefix=portage.const.EPREFIX):
        if trees is not None:
                # clean up any existing portdbapi instances
                for myroot in trees:
@@ -504,9 +505,7 @@ def create_trees(config_root=None, target_root=None, trees=None, env=None):
 
        if env is None:
                env = os.environ
-       eprefix = env.get("__PORTAGE_TEST_EPREFIX")
-       if eprefix is None:
-               eprefix = portage.const.EPREFIX
+
        settings = config(config_root=config_root, target_root=target_root,
                env=env, eprefix=eprefix)
        settings.lock()

diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py
index 1a752be8dd30d9264cae7dbc51ebbae1218b2006..cbf42efc3cd42b3ba74a0853e196dc43003e19c1 100644 (file)
--- a/pym/portage/tests/resolver/ResolverPlayground.py
+++ b/pym/portage/tests/resolver/ResolverPlayground.py
@@ -475,7 +475,6 @@ class ResolverPlayground(object):
                                portdir_overlay.append(path)
 
                env = {
-                       "__PORTAGE_TEST_EPREFIX": self.eprefix,
                        "ACCEPT_KEYWORDS": "x86",
                        "DISTDIR" : self.distdir,
                        "PKGDIR": os.path.join(self.eroot, "usr/portage/packages"),
@@ -491,7 +490,7 @@ class ResolverPlayground(object):
                if 'PORTAGE_GRPNAME' in os.environ:
                        env['PORTAGE_GRPNAME'] = os.environ['PORTAGE_GRPNAME']
 
-               trees = portage.create_trees(env=env)
+               trees = portage.create_trees(env=env, eprefix=self.eprefix)
                for root, root_trees in trees.items():
                        settings = root_trees["vartree"].settings
                        settings._init_dirs()