[gentoo-commits] proj/portage:master commit in: pym/_emerge/

[Zac Medico]

commit:     e3a953fe5bfc287c7f2bae85ad4a196baf7d64e4
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 20:33:13 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 20:34:53 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e3a953fe

load_emerge_config: fix 'env' keyword argument to override os.environ

 pym/_emerge/actions.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 3c6c265f7..ed3db756e 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -2423,10 +2423,11 @@ def load_emerge_config(emerge_config=None, **kargs):
        if emerge_config is None:
                emerge_config = _emerge_config(**kargs)
 
+       env = kargs.get('env', os.environ)
        kwargs = {}
        for k, envvar in (("config_root", "PORTAGE_CONFIGROOT"), 
("target_root", "ROOT"),
                        ("eprefix", "EPREFIX")):
-               v = os.environ.get(envvar, None)
+               v = env.get(envvar)
                if v and v.strip():
                        kwargs[k] = v
        emerge_config.trees = portage.create_trees(trees=emerge_config.trees,