From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 37BC9138335 for ; Sun, 23 Dec 2018 10:32:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11C95E09F7; Sun, 23 Dec 2018 10:32:57 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D8E90E09F7 for ; Sun, 23 Dec 2018 10:32:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5B63335C8C for ; Sun, 23 Dec 2018 10:32:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB0A3458 for ; Sun, 23 Dec 2018 10:32:52 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1545561072.d9a8a3922164ccd23d037302d7335b955c173927.heroxbd@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: d9a8a3922164ccd23d037302d7335b955c173927 X-VCS-Branch: master Date: Sun, 23 Dec 2018 10:32:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 96a023c9-acd7-4f8a-923e-65312b700a1a X-Archives-Hash: 9aa6fb8fb2327443adaa51bce4aa9283 commit: d9a8a3922164ccd23d037302d7335b955c173927 Author: Benda Xu gentoo org> AuthorDate: Thu Dec 20 12:40:39 2018 +0000 Commit: Benda XU gentoo 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 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}" )