| 1 |
Author: zmedico |
| 2 |
Date: 2009-08-29 07:03:21 +0000 (Sat, 29 Aug 2009) |
| 3 |
New Revision: 14168 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Use KeyValuePairFileLoader instead of getconfig() for /etc/portage/modules, |
| 9 |
since getconfig() is too strict about variable names now. Thanks to Arfrever |
| 10 |
for reporting. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/portage/__init__.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/portage/__init__.py 2009-08-28 09:04:42 UTC (rev 14167) |
| 16 |
+++ main/trunk/pym/portage/__init__.py 2009-08-29 07:03:21 UTC (rev 14168) |
| 17 |
@@ -69,6 +69,7 @@ |
| 18 |
'get_operator,isjustname,isspecific,isvalidatom,' + \ |
| 19 |
'match_from_list,match_to_list', |
| 20 |
'portage.eclass_cache', |
| 21 |
+ 'portage.env.loaders', |
| 22 |
'portage.exception', |
| 23 |
'portage.getbinpkg', |
| 24 |
'portage.locks', |
| 25 |
@@ -1625,8 +1626,10 @@ |
| 26 |
|
| 27 |
self.module_priority = ["user","default"] |
| 28 |
self.modules = {} |
| 29 |
- self.modules["user"] = getconfig( |
| 30 |
- os.path.join(config_root, MODULES_FILE_PATH)) |
| 31 |
+ modules_loader = portage.env.loaders.KeyValuePairFileLoader( |
| 32 |
+ os.path.join(config_root, MODULES_FILE_PATH), None, None) |
| 33 |
+ modules_dict, modules_errors = modules_loader.load() |
| 34 |
+ self.modules["user"] = modules_dict |
| 35 |
if self.modules["user"] is None: |
| 36 |
self.modules["user"] = {} |
| 37 |
self.modules["default"] = { |
Archives