From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C0D321382C5 for ; Fri, 5 Jan 2018 20:36:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB4E8E090A; Fri, 5 Jan 2018 20:36:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB8F2E090A for ; Fri, 5 Jan 2018 20:36:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D940C335C3A for ; Fri, 5 Jan 2018 20:36:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A1DF9145 for ; Fri, 5 Jan 2018 20:36:44 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1515184493.e3a953fe5bfc287c7f2bae85ad4a196baf7d64e4.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/actions.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e3a953fe5bfc287c7f2bae85ad4a196baf7d64e4 X-VCS-Branch: master Date: Fri, 5 Jan 2018 20:36:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e59b07a1-66f0-4afd-ad82-719950ec7947 X-Archives-Hash: 56bdaab9fcde917c50f5c41ea6646c15 commit: e3a953fe5bfc287c7f2bae85ad4a196baf7d64e4 Author: Zac Medico gentoo org> AuthorDate: Fri Jan 5 20:33:13 2018 +0000 Commit: Zac Medico gentoo 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,