diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-08-29 07:03:21 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-29 07:03:21 +0000 |
| commit | 11cb9d173ecb97744660ad687727872305cd52e8 (patch) | |
| tree | 669c49eeaa3de4211121abade370d9f6f53d1b45 | |
| parent | 68a803b2cfcdea5b649873a7680f5ba719462698 (diff) | |
| download | portage-11cb9d173ecb97744660ad687727872305cd52e8.tar.gz portage-11cb9d173ecb97744660ad687727872305cd52e8.tar.bz2 portage-11cb9d173ecb97744660ad687727872305cd52e8.zip | |
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
| -rw-r--r-- | pym/portage/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
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"] = { |