From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A01ED15813A for ; Tue, 21 Jan 2025 21:52:33 +0000 (UTC) Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 714BF33BE3B for ; Tue, 21 Jan 2025 21:52:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62D32E01E4; Tue, 21 Jan 2025 21:52:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 46D05E01E4 for ; Tue, 21 Jan 2025 21:52:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 503DC33BE3B for ; Tue, 21 Jan 2025 21:52:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC5EBE65 for ; Tue, 21 Jan 2025 21:52:28 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1737496267.b51ceb558a282b8fdfc3952f81be037caa3d5fbe.dilfridge@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: b51ceb558a282b8fdfc3952f81be037caa3d5fbe X-VCS-Branch: master Date: Tue, 21 Jan 2025 21:52:28 +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: b5d52d09-ff8e-49b9-9a06-93a855c1781e X-Archives-Hash: f18591f369c30c2d1c5e0df3eafa4ef1 commit: b51ceb558a282b8fdfc3952f81be037caa3d5fbe Author: Andreas K. Hüttel gentoo org> AuthorDate: Tue Jan 21 21:46:50 2025 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Tue Jan 21 21:51:07 2025 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b51ceb55 Ensure that the repo_base directory is owned by portage:portage This allows emerge to use usersync from the start Signed-off-by: Andreas K. Hüttel gentoo.org> catalyst/base/stagebase.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index b26c22ac..417b4b74 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1372,6 +1372,11 @@ class StageBase(TargetBase, ClearBase, GenBase): chroot_location = self.to_chroot(location) clear_path(str(chroot_location)) + # Ensure that the repo dir and all its contents are owned by portage + if os.path.exists(self.settings['stage_path']+self.settings['repo_basedir']): + cmd(['chown', '-R', 'portage:portage', + self.settings['stage_path']+self.settings['repo_basedir']) + if "sticky-config" not in self.settings["options"]: # re-write the make.conf to be sure it is clean self.write_make_conf(setup=False)