commit: cfc3ca6647235d8a3fbe719b9d447863a75deeb6 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sun Jul 7 13:18:54 2019 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> 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 <chewi <AT> gentoo.org> Signed-off-by: Zac Medico <zmedico <AT> 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)
