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 D47F1138350 for ; Tue, 31 Mar 2020 17:09:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04824E0985; Tue, 31 Mar 2020 17:09:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 D93DCE0985 for ; Tue, 31 Mar 2020 17:09:11 +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 CA26334F276 for ; Tue, 31 Mar 2020 17:09:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C45DD1AA for ; Tue, 31 Mar 2020 17:09:08 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1585674506.095f4b4daf6029369c5d5ed308607c8b1e45276d.grobian@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: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 095f4b4daf6029369c5d5ed308607c8b1e45276d X-VCS-Branch: master Date: Tue, 31 Mar 2020 17:09:08 +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: a35189fc-a70a-42d5-915c-644ab0601fe9 X-Archives-Hash: 7323fb44726a8ff9c8a8fe0537a921a8 commit: 095f4b4daf6029369c5d5ed308607c8b1e45276d Author: Fabian Groffen gentoo org> AuthorDate: Tue Mar 31 17:08:26 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Mar 31 17:08:26 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=095f4b4d scripts/bootstrap-prefix: check ownership of $EPREFIX dir, bug #715312 Closes: https://bugs.gentoo.org/715312 Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 5eca478c5a..25e091c37a 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -2714,10 +2714,20 @@ EOF EPREFIX= continue fi + if [[ $(stat -c '%U/%G' "${EPREFIX}"/.canihaswrite) != \ + $(stat -c '%U/%G' "${EPREFIX}") ]] ; + then + echo + echo "The $EPREFIX directory has different ownership than expected." + echo "Ensure the directory is owned (user and group) by your" + echo "primary ids" + EPREFIX= + continue + fi # don't really expect this one to fail rm -f "${EPREFIX}"/.canihaswrite || exit 1 # location seems ok - break; + break done export STAGE1_PATH=${PATH} export PATH="$EPREFIX/usr/bin:$EPREFIX/bin:$EPREFIX/tmp/usr/bin:$EPREFIX/tmp/bin:$EPREFIX/tmp/usr/local/bin:${PATH}"