summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-10 01:41:37 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-10 01:41:37 -0700
commitc5956b1b1e6f17024e9b732f0ec22419c6c9b7cb (patch)
treefe2eaf78add5aa3dd61b15a47953cc9671b99745
parent3b3178a9c9ef56f658ca07dc526e0409ce1cd3df (diff)
downloadportage-c5956b1b1e6f17024e9b732f0ec22419c6c9b7cb.tar.gz
portage-c5956b1b1e6f17024e9b732f0ec22419c6c9b7cb.tar.bz2
portage-c5956b1b1e6f17024e9b732f0ec22419c6c9b7cb.zip
Try using _emerge.main.setconfig_fallback() to make tests pass
on the buildbot.
-rw-r--r--pym/portage/tests/resolver/ResolverPlayground.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py
index b4ff4180c..ab231adaa 100644
--- a/pym/portage/tests/resolver/ResolverPlayground.py
+++ b/pym/portage/tests/resolver/ResolverPlayground.py
@@ -11,13 +11,14 @@ from portage.dbapi.porttree import portagetree
from portage.dbapi.bintree import binarytree
from portage.dep import Atom
from portage.package.ebuild.config import config
-from portage.sets import load_default_config
+from portage.sets import SetConfig
from portage.versions import catsplit
from _emerge.Blocker import Blocker
from _emerge.create_depgraph_params import create_depgraph_params
from _emerge.depgraph import backtrack_depgraph
from _emerge.RootConfig import RootConfig
+from _emerge.main import setconfig_fallback
class ResolverPlayground(object):
"""
@@ -170,8 +171,9 @@ class ResolverPlayground(object):
for root, root_trees in trees.items():
settings = root_trees["vartree"].settings
settings._init_dirs()
- setconfig = load_default_config(settings, root_trees)
+ setconfig = SetConfig([], settings, root_trees)
root_trees["root_config"] = RootConfig(settings, root_trees, setconfig)
+ setconfig_fallback(root_trees["root_config"])
return settings, trees