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 995CF138334 for ; Tue, 3 Dec 2019 11:17:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C40BBE0809; Tue, 3 Dec 2019 11:17:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 A9C4AE0809 for ; Tue, 3 Dec 2019 11:17:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 5524534D720 for ; Tue, 3 Dec 2019 11:17:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E12E38AD for ; Tue, 3 Dec 2019 11:17:20 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1575371834.98bc7e59e6ef7e9b84d39e7eb447628967e3931c.haubi@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: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: 98bc7e59e6ef7e9b84d39e7eb447628967e3931c X-VCS-Branch: master Date: Tue, 3 Dec 2019 11:17:20 +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: e33d4eb2-4eed-4525-aa4d-f009f86138ea X-Archives-Hash: 84f3d1c64982fc7194e79110cb9fe625 commit: 98bc7e59e6ef7e9b84d39e7eb447628967e3931c Author: Michael Haubenwallner gentoo org> AuthorDate: Tue Dec 3 11:16:11 2019 +0000 Commit: Michael Haubenwallner gentoo org> CommitDate: Tue Dec 3 11:17:14 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=98bc7e59 bootstrap-prefix.sh: fix cleaning the resume list Signed-off-by: Michael Haubenwallner gentoo.org> scripts/bootstrap-prefix.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 888b620148..f1f670da9d 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -2047,7 +2047,7 @@ bootstrap_stage3() { # "wipe" mtimedb such that the resume list is proper after this stage # (--depclean may fail, which is ok) - sed -i -e 's/resume_backup/cleared/' "${EPREFIX}"/var/cache/edb/mtimedb + sed -i -e 's/resume/cleared/' "${ROOT}"/var/cache/edb/mtimedb einfo "stage3 successfully finished" } @@ -2822,7 +2822,7 @@ EOF local cmd="emerge -e system" if [[ -e ${EPREFIX}/var/cache/edb/mtimedb ]] && \ - grep -q resume_backup "${EPREFIX}"/var/cache/edb/mtimedb ; + grep -q resume "${EPREFIX}"/var/cache/edb/mtimedb ; then cmd="emerge --resume" fi