[gentoo-commits] proj/portage:master commit in: bin/

[Zac Medico]

commit:     17fce85669beec41747d65b37a55747b2f3ddb3c
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed May 16 20:35:57 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed May 16 20:35:57 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=17fce856

phase-helpers.sh: fix has/best_version for cross-prefix portageq (bug 655414)

When the portageq root argument refers to ${PORTAGE_OVERRIDE_EPREFIX},
also export a consistent ${EPREFIX}, since portageq asserts that the
root argument ends with ${EPREFIX}.

Bug: https://bugs.gentoo.org/655414

 bin/phase-helpers.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 3e455d715..99a30a176 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -900,7 +900,10 @@ ___best_version_and_has_version_common() {
                                die "${FUNCNAME[1]}: option ${root_arg} is not 
supported with EAPI ${EAPI}"
                        fi
                        if ___eapi_has_prefix_variables; then
+                               # Since portageq requires the root argument be 
consistent
+                               # with EPREFIX, ensure consistency here (bug 
655414).
                                root=/${PORTAGE_OVERRIDE_EPREFIX#/}
+                               local -x EPREFIX=${PORTAGE_OVERRIDE_EPREFIX}
                        else
                                root=/
                        fi ;;