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

[Benda XU]

commit:     d9a8a3922164ccd23d037302d7335b955c173927
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 20 12:40:39 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 10:31:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d9a8a392

scripts/bootstrap-prefix.sh: portage library into python search path

  Otherwise PYTHONPATH is needed for both portageq and emerge.

Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 74395071ec..c358c0955e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -669,6 +669,10 @@ bootstrap_portage() {
        rm -f "${ROOT}"/tmp/usr/lib/portage/bin/ebuild-helpers/sed
 
        [[ -e "${ROOT}"/tmp/usr/portage ]] || ln -s "${PORTDIR}" 
"${ROOT}"/tmp/usr/portage
+       for d in "${ROOT}"/tmp/usr/lib/python?.?; do
+               [[ -e ${d}/portage ]] || ln -s 
"${ROOT}"/tmp/usr/lib/portage/pym/portage ${d}/portage
+               [[ -e ${d}/_emerge ]] || ln -s 
"${ROOT}"/tmp/usr/lib/portage/pym/_emerge ${d}/_emerge
+       done
 
        if [[ -s ${PORTDIR}/profiles/repo_name ]]; then
                # sync portage's repos.conf with the tree being used
@@ -1463,7 +1467,6 @@ do_emerge_pkgs() {
                        PORTAGE_CONFIGROOT="${EPREFIX}" \
                        PORTAGE_SYNC_STALE=0 \
                        FEATURES="-news ${FEATURES}" \
-                       PYTHONPATH="${ROOT}"/tmp/usr/lib/portage/pym \
                        USE="${myuse[*]}" \
                        emerge -v --oneshot --root-deps ${opts} "${pkg}" 
                )