From b5f17cb8bcdf5df5784add95fe7079cea64d4461 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 10 Dec 2011 14:33:42 -0800 Subject: 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. --- pym/portage/data.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pym/portage/data.py') 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 -- cgit v1.2.3-1-g7c22