From c6f3fd519642082b5e658a37755063678850b4ab Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 2 Mar 2010 22:55:54 +0000
Subject: Fix incorrect merge.

svn path=/main/branches/2.1.7/; revision=15726
---
 pym/portage/_sets/__init__.py | 9 +++++----
 1 file 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.
-- 
cgit v1.2.3-1-g7c22