commit: 81c88389f0456385545abb1bd703f8c25f009697 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Feb 8 17:47:03 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Feb 8 18:18:56 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=81c88389
phase-helpers.sh: avoid passing an empty root value to portageq Bug: https://bugs.gentoo.org/708660 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> Reviewed-by: Zac Medico <zmedico <AT> gentoo.org> bin/phase-helpers.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 020862ba0..3deb28c68 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -878,7 +878,7 @@ ___best_version_and_has_version_common() { if ___eapi_has_prefix_variables; then case ${root_arg} in -r) root=${ROOT%/}/${EPREFIX#/} ;; - -d) root=${ESYSROOT} ;; + -d) root=${ESYSROOT:-/} ;; -b) # Use /${PORTAGE_OVERRIDE_EPREFIX#/} which is equivalent # to BROOT, except BROOT is only defined in src_* phases. @@ -888,8 +888,8 @@ ___best_version_and_has_version_common() { esac else case ${root_arg} in - -r) root=${ROOT} ;; - -d) root=${SYSROOT} ;; + -r) root=${ROOT:-/} ;; + -d) root=${SYSROOT:-/} ;; -b) root=/ ;; esac fi ;;
