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 74E99138330 for ; Sun, 7 Jan 2018 11:56:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86DB5E07DB; Sun, 7 Jan 2018 11:56:08 +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 66214E07DB for ; Sun, 7 Jan 2018 11:56:08 +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 7985033C4EE for ; Sun, 7 Jan 2018 11:56:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3ECD7151 for ; Sun, 7 Jan 2018 11:56:06 +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: <1515326035.a004edaf42e8ae13d0db51d915746317b4133630.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: a004edaf42e8ae13d0db51d915746317b4133630 X-VCS-Branch: master Date: Sun, 7 Jan 2018 11:56:06 +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: 631834b5-a859-486f-a50d-fabb303bf4ba X-Archives-Hash: 8cd7e92d0b9b202fe4372d19494975e5 commit: a004edaf42e8ae13d0db51d915746317b4133630 Author: Zac Medico gentoo org> AuthorDate: Sun Jan 7 11:48:44 2018 +0000 Commit: Zac Medico gentoo 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)