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 92D2F1382F6 for ; Thu, 7 Jul 2016 02:41:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AD33CE08A1; Thu, 7 Jul 2016 02:41:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44E85E0AD7 for ; Thu, 7 Jul 2016 02:41:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4886D340D5E for ; Thu, 7 Jul 2016 02:41:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E718E2451 for ; Thu, 7 Jul 2016 02:41:24 +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: <1467859257.f3c51fb01b54321c026cfb2857ba3ee65cecaf98.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: f3c51fb01b54321c026cfb2857ba3ee65cecaf98 X-VCS-Branch: master Date: Thu, 7 Jul 2016 02:41:24 +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-Archives-Salt: 054f3771-0782-4191-959d-9b04151cfec0 X-Archives-Hash: 9b77a5077e6b5091be4cb43ff8ea8542 commit: f3c51fb01b54321c026cfb2857ba3ee65cecaf98 Author: Benda Xu gentoo org> AuthorDate: Sat Jun 4 07:25:15 2016 +0000 Commit: Benda XU gentoo org> CommitDate: Thu Jul 7 02:40:57 2016 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f3c51fb0 s/bootstrap-prefix.sh: remove EPREFIX/tmp after "emerge -e system". partially reverts 3a945696443b. A rerun of bootstrap script after "emerge -e system" failure should not go through stage1 again. scripts/bootstrap-prefix.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index a46ccdf..e05c81a 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1520,12 +1520,6 @@ bootstrap_stage3() { # Switch to the proper portage. hash -r - # Get rid of the temporary tools. - if [[ -d ${ROOT}/tmp/var/tmp ]] ; then - rm -rf "${ROOT}"/tmp - mkdir "${ROOT}"/tmp - fi - # Update the portage tree. treedate=$(date -f "${ROOT}"/usr/portage/metadata/timestamp +%s) nowdate=$(date +%s) @@ -2173,7 +2167,13 @@ EOF hash -r # tmp/* stuff is removed in stage3 - if ! emerge -e system ; then + if emerge -e system ; then + # Now, after 'emerge -e system', we can get rid of the temporary tools. + if [[ -d ${EPREFIX}/tmp/var/tmp ]] ; then + rm -Rf "${EPREFIX}"/tmp || return 1 + mkdir -p "${EPREFIX}"/tmp || return 1 + fi + else # emerge -e system fail cat << EOF