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

[Zac Medico]

commit:     a004edaf42e8ae13d0db51d915746317b4133630
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 11:48:44 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 11:53:55 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=a004edaf

load_emerge_config: add 'env' keyword argument

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

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index ed3db756e..97df9f716 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -2418,13 +2418,13 @@ class _emerge_config(SlotObject):
        def __len__(self):
                return 3
 
-def load_emerge_config(emerge_config=None, **kargs):
+def load_emerge_config(emerge_config=None, env=None, **kargs):
 
        if emerge_config is None:
                emerge_config = _emerge_config(**kargs)
 
-       env = kargs.get('env', os.environ)
-       kwargs = {}
+       env = os.environ if env is None else env
+       kwargs = {'env': env}
        for k, envvar in (("config_root", "PORTAGE_CONFIGROOT"), 
("target_root", "ROOT"),
                        ("eprefix", "EPREFIX")):
                v = env.get(envvar)