summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-03-02 22:55:54 +0000
committerZac Medico <zmedico@gentoo.org>2010-03-02 22:55:54 +0000
commitc6f3fd519642082b5e658a37755063678850b4ab (patch)
tree15c292735746b0424fe426a5ae4cd8edfed1f145
parent08cc2f7d2d8646d4dd82e736719f9dcc9bc46f48 (diff)
downloadportage-c6f3fd519642082b5e658a37755063678850b4ab.tar.gz
portage-c6f3fd519642082b5e658a37755063678850b4ab.tar.bz2
portage-c6f3fd519642082b5e658a37755063678850b4ab.zip
Fix incorrect merge.
svn path=/main/branches/2.1.7/; revision=15726
-rw-r--r--pym/portage/_sets/__init__.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/pym/portage/_sets/__init__.py b/pym/portage/_sets/__init__.py
index 73adafd3e..04937c379 100644
--- a/pym/portage/_sets/__init__.py
+++ b/pym/portage/_sets/__init__.py
@@ -34,10 +34,11 @@ class SetConfigError(Exception):
class SetConfig(object):
def __init__(self, paths, settings, trees):
- defaults={
- "PORTAGE_CONFIGROOT" : settings["PORTAGE_CONFIGROOT"],
- "ROOT" : settings["ROOT"],
- })
+ self._parser = SafeConfigParser(
+ defaults={
+ "PORTAGE_CONFIGROOT" : settings["PORTAGE_CONFIGROOT"],
+ "ROOT" : settings["ROOT"],
+ })
#self._parser.read(paths)
# The "paths" argument is ignored and the config for
# system and world sets is hardcoded below.