| 1 |
commit: e3a953fe5bfc287c7f2bae85ad4a196baf7d64e4 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 5 20:33:13 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 5 20:34:53 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e3a953fe |
| 7 |
|
| 8 |
load_emerge_config: fix 'env' keyword argument to override os.environ |
| 9 |
|
| 10 |
pym/_emerge/actions.py | 3 ++- |
| 11 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 12 |
|
| 13 |
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py |
| 14 |
index 3c6c265f7..ed3db756e 100644 |
| 15 |
--- a/pym/_emerge/actions.py |
| 16 |
+++ b/pym/_emerge/actions.py |
| 17 |
@@ -2423,10 +2423,11 @@ def load_emerge_config(emerge_config=None, **kargs): |
| 18 |
if emerge_config is None: |
| 19 |
emerge_config = _emerge_config(**kargs) |
| 20 |
|
| 21 |
+ env = kargs.get('env', os.environ) |
| 22 |
kwargs = {} |
| 23 |
for k, envvar in (("config_root", "PORTAGE_CONFIGROOT"), ("target_root", "ROOT"), |
| 24 |
("eprefix", "EPREFIX")): |
| 25 |
- v = os.environ.get(envvar, None) |
| 26 |
+ v = env.get(envvar) |
| 27 |
if v and v.strip(): |
| 28 |
kwargs[k] = v |
| 29 |
emerge_config.trees = portage.create_trees(trees=emerge_config.trees, |
Archives