diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-12-10 14:33:42 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-10 14:33:42 -0800 |
| commit | b5f17cb8bcdf5df5784add95fe7079cea64d4461 (patch) | |
| tree | 977d9b8fc56b2d55d3e4bd9c77e6c170b055fef7 /pym/portage/data.py | |
| parent | config: skip unneeded constructor code for clones (diff) | |
| download | portage-b5f17cb8bcdf5df5784add95fe7079cea64d4461.tar.gz portage-b5f17cb8bcdf5df5784add95fe7079cea64d4461.tar.bz2 portage-b5f17cb8bcdf5df5784add95fe7079cea64d4461.zip | |
config: init data/output modules in constructor
The first constructed config object initializes these modules, and
subsequent calls to the _init() functions have no effect.
Diffstat (limited to 'pym/portage/data.py')
| -rw-r--r-- | pym/portage/data.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/portage/data.py b/pym/portage/data.py index 53af6b966..7c1733445 100644 --- a/pym/portage/data.py +++ b/pym/portage/data.py @@ -169,13 +169,14 @@ def _init(settings): initialize global variables. This allows settings to come from make.conf instead of requiring them to be set in the calling environment. """ - if '_portage_grpname' not in _initialized_globals: + if '_portage_grpname' not in _initialized_globals and \ + '_portage_uname' not in _initialized_globals: + v = settings.get('PORTAGE_GRPNAME') if v is not None: globals()['_portage_grpname'] = v _initialized_globals.add('_portage_grpname') - if '_portage_uname' not in _initialized_globals: v = settings.get('PORTAGE_USERNAME') if v is not None: globals()['_portage_uname'] = v |