diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-11 00:15:16 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-11 00:15:16 -0800 |
| commit | 0654d66ccead49eb7d5edf2df189bfe77773b89e (patch) | |
| tree | 2890c2c8969f04e005d602125fcc14ce26f150ef | |
| parent | d67d11c82338a6d9ee073eab18bd0e24cd846c77 (diff) | |
| download | portage-0654d66ccead49eb7d5edf2df189bfe77773b89e.tar.gz portage-0654d66ccead49eb7d5edf2df189bfe77773b89e.tar.bz2 portage-0654d66ccead49eb7d5edf2df189bfe77773b89e.zip | |
data._init(): use 'portage' default in first callv2.2.0_alpha80
| -rw-r--r-- | pym/portage/data.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/pym/portage/data.py b/pym/portage/data.py index a25b282ab..cf94ab0cd 100644 --- a/pym/portage/data.py +++ b/pym/portage/data.py @@ -184,12 +184,10 @@ def _init(settings): if '_portage_grpname' not in _initialized_globals and \ '_portage_username' not in _initialized_globals: - v = settings.get('PORTAGE_GRPNAME') - if v is not None: - globals()['_portage_grpname'] = v - _initialized_globals.add('_portage_grpname') - - v = settings.get('PORTAGE_USERNAME') - if v is not None: - globals()['_portage_username'] = v - _initialized_globals.add('_portage_username') + v = settings.get('PORTAGE_GRPNAME', 'portage') + globals()['_portage_grpname'] = v + _initialized_globals.add('_portage_grpname') + + v = settings.get('PORTAGE_USERNAME', 'portage') + globals()['_portage_username'] = v + _initialized_globals.add('_portage_username') |