diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-15 01:05:26 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-15 01:05:26 -0700 |
| commit | 4f0ce00514188aec0bd378b2cfdaaace3828f17b (patch) | |
| tree | 3c3b544edbdbabe1c98fdb99adf2d3b1695311c2 | |
| parent | 6c82baddfe66645054acf5d082cc04137e8a60ca (diff) | |
| download | portage-4f0ce00514188aec0bd378b2cfdaaace3828f17b.tar.gz portage-4f0ce00514188aec0bd378b2cfdaaace3828f17b.tar.bz2 portage-4f0ce00514188aec0bd378b2cfdaaace3828f17b.zip | |
Avoid KeyError if PORTAGE_USERNAME or PORTAGE_GRPNAME are unset.
| -rw-r--r-- | pym/portage/tests/resolver/ResolverPlayground.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py index 64cd6f1db..b713c652c 100644 --- a/pym/portage/tests/resolver/ResolverPlayground.py +++ b/pym/portage/tests/resolver/ResolverPlayground.py @@ -198,17 +198,20 @@ class ResolverPlayground(object): f.close() def _load_config(self): - # Pass along PORTAGE_USERNAME and PORTAGE_GRPNAME since they - # need to be inherited by ebuild subprocesses. env = { "ACCEPT_KEYWORDS": "x86", "PORTDIR": self.portdir, "ROOT": self.root, 'PORTAGE_TMPDIR' : os.path.join(self.root, 'var/tmp'), - 'PORTAGE_USERNAME' : os.environ["PORTAGE_USERNAME"], - 'PORTAGE_GRPNAME' : os.environ["PORTAGE_GRPNAME"], } + # Pass along PORTAGE_USERNAME and PORTAGE_GRPNAME since they + # need to be inherited by ebuild subprocesses. + if 'PORTAGE_USERNAME' in os.environ: + env['PORTAGE_USERNAME'] = os.environ['PORTAGE_USERNAME'] + if 'PORTAGE_GRPNAME' in os.environ: + env['PORTAGE_GRPNAME'] = os.environ['PORTAGE_GRPNAME'] + settings = config(config_root=self.root, target_root=self.root, env=env) settings.lock() |