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 6DD89138334 for ; Mon, 8 Jul 2019 06:49:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA292E0824; Mon, 8 Jul 2019 06:49:09 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 8CFB4E0824 for ; Mon, 8 Jul 2019 06:49:09 +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 6337B34729C for ; Mon, 8 Jul 2019 06:49:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9CCEC62F for ; Mon, 8 Jul 2019 06:49: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: <1562567835.cfc3ca6647235d8a3fbe719b9d447863a75deeb6.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/actions.py X-VCS-Directories: lib/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: cfc3ca6647235d8a3fbe719b9d447863a75deeb6 X-VCS-Branch: master Date: Mon, 8 Jul 2019 06:49: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ab1ed4ba-95c6-41e1-8c55-1a0723ab6c4b X-Archives-Hash: fe8c07045ec9c1f79b119b5a4dce9788 commit: cfc3ca6647235d8a3fbe719b9d447863a75deeb6 Author: James Le Cuirot gentoo org> AuthorDate: Sun Jul 7 13:18:54 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jul 8 06:37:15 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=cfc3ca66 emerge: Don't treat empty EPREFIX or PORTAGE_CONFIGROOT as unset If a prefix user wanted to build within a ROOT but without a prefix, they previously had to set EPREFIX=/ rather than EPREFIX= as the latter was simply treated as unset. Also applies to ROOT and SYSROOT but probably makes no difference to these as they are blank by default. This should be safe to do as all these variables get normalised anyway. Bug: https://bugs.gentoo.org/642604 Closes: https://github.com/gentoo/portage/pull/434 Signed-off-by: James Le Cuirot gentoo.org> Signed-off-by: Zac Medico gentoo.org> lib/_emerge/actions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py index 3e32bf8bc..6ca323501 100644 --- a/lib/_emerge/actions.py +++ b/lib/_emerge/actions.py @@ -2455,7 +2455,7 @@ def load_emerge_config(emerge_config=None, env=None, **kargs): for k, envvar in (("config_root", "PORTAGE_CONFIGROOT"), ("target_root", "ROOT"), ("sysroot", "SYSROOT"), ("eprefix", "EPREFIX")): v = env.get(envvar) - if v and v.strip(): + if v is not None: kwargs[k] = v emerge_config.trees = portage.create_trees(trees=emerge_config.trees, **kwargs)