From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 29 Aug 2009 07:03:21 +0000 (-0000)
Subject: Use KeyValuePairFileLoader instead of getconfig() for /etc/portage/modules,
X-Git-Tag: v2.2_rc41~90
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=11cb9d173ecb97744660ad687727872305cd52e8;p=portage.git

Use KeyValuePairFileLoader instead of getconfig() for /etc/portage/modules,
since getconfig() is too strict about variable names now. Thanks to Arfrever
for reporting.

svn path=/main/trunk/; revision=14168
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 4e6562bcc..c9ae08f44 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -69,6 +69,7 @@ try:
 			'get_operator,isjustname,isspecific,isvalidatom,' + \
 			'match_from_list,match_to_list',
 		'portage.eclass_cache',
+		'portage.env.loaders',
 		'portage.exception',
 		'portage.getbinpkg',
 		'portage.locks',
@@ -1625,8 +1626,10 @@ class config(object):
 
 			self.module_priority    = ["user","default"]
 			self.modules            = {}
-			self.modules["user"] = getconfig(
-				os.path.join(config_root, MODULES_FILE_PATH))
+			modules_loader = portage.env.loaders.KeyValuePairFileLoader(
+				os.path.join(config_root, MODULES_FILE_PATH), None, None)
+			modules_dict, modules_errors = modules_loader.load()
+			self.modules["user"] = modules_dict
 			if self.modules["user"] is None:
 				self.modules["user"] = {}
 			self.modules["default"] = {