[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     0cddd6015439d681bb07ad653de3515f5a66ae9f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  5 17:54:16 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun  5 17:54:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0cddd601

scripts/bootstrap-prefix: ensure we pickup portage right after being emerged

The portage in tmp may not work well with newer python, so ensure that
we don't run that portage anymore once we installed a proper one.

 scripts/bootstrap-prefix.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 75eaf07356..910483897c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1791,18 +1791,19 @@ bootstrap_stage3() {
        TIME_T_32_BIT_OK=yes \
        emerge_pkgs "" "${pkgs[@]}" || return 1
 
+       if [[ ! -x "${ROOT}"/sbin/openrc-run ]]; then
+               echo "We need openrc-run at ${ROOT}/sbin to merge rsync." > 
"${ROOT}"/sbin/openrc-run
+               chmod +x "${ROOT}"/sbin/openrc-run
+       fi
+
        # gettext pulls in portage, which since 2.2.28 needs ssl enabled, so
        # we need to lift our mask for that.
        pkgs=(
-               $( [[ ${OFFLINE_MODE} ]] || echo sys-devel/gettext )
-               $( [[ ${OFFLINE_MODE} ]] || echo net-misc/wget )
                virtual/os-headers
-               sys-apps/portage
+               $( [[ ${OFFLINE_MODE} ]] \
+                       && echo sys-apps/portage \
+                       || echo sys-devel/gettext )
        )
-       if [[ ! -x "${ROOT}"/sbin/openrc-run ]]; then
-               echo "We need openrc-run at ${ROOT}/sbin to merge rsync." > 
"${ROOT}"/sbin/openrc-run
-               chmod +x "${ROOT}"/sbin/openrc-run
-       fi
        USE="ssl" \
        emerge_pkgs "" "${pkgs[@]}" || return 1