From a7f3832a2310d692dd2384befd784f988cf88b3f Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Wed, 16 May 2018 12:49:25 -0400 Subject: [PATCH] phase-helpers.sh: make ROOT=/ has_version work again To: gentoo-portage-dev@lists.gentoo.org Don't use the EROOT variable when calling portageq. Use ROOT + EPREFIX as was done before commit 43b6be7423aaebee26e4659d580a9a17b4fde01e. Bug: https://bugs.gentoo.org/655860 --- bin/phase-helpers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 59c19cf67..8b40b77ca 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -891,7 +891,7 @@ ___best_version_and_has_version_common() { case ${root_arg} in "") if ___eapi_has_prefix_variables; then - root=${EROOT} + root=${ROOT%/}${EPREFIX}/ else root=${ROOT} fi ;; -- 2.17.0