| 1 |
Bug: https://bugs.gentoo.org/708660 |
| 2 |
Signed-off-by: Mike Gilbert <floppym@g.o> |
| 3 |
--- |
| 4 |
bin/phase-helpers.sh | 6 +++--- |
| 5 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 6 |
|
| 7 |
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh |
| 8 |
index 020862ba0..3deb28c68 100644 |
| 9 |
--- a/bin/phase-helpers.sh |
| 10 |
+++ b/bin/phase-helpers.sh |
| 11 |
@@ -878,7 +878,7 @@ ___best_version_and_has_version_common() { |
| 12 |
if ___eapi_has_prefix_variables; then |
| 13 |
case ${root_arg} in |
| 14 |
-r) root=${ROOT%/}/${EPREFIX#/} ;; |
| 15 |
- -d) root=${ESYSROOT} ;; |
| 16 |
+ -d) root=${ESYSROOT:-/} ;; |
| 17 |
-b) |
| 18 |
# Use /${PORTAGE_OVERRIDE_EPREFIX#/} which is equivalent |
| 19 |
# to BROOT, except BROOT is only defined in src_* phases. |
| 20 |
@@ -888,8 +888,8 @@ ___best_version_and_has_version_common() { |
| 21 |
esac |
| 22 |
else |
| 23 |
case ${root_arg} in |
| 24 |
- -r) root=${ROOT} ;; |
| 25 |
- -d) root=${SYSROOT} ;; |
| 26 |
+ -r) root=${ROOT:-/} ;; |
| 27 |
+ -d) root=${SYSROOT:-/} ;; |
| 28 |
-b) root=/ ;; |
| 29 |
esac |
| 30 |
fi ;; |
| 31 |
-- |
| 32 |
2.25.0 |
Archives