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 C6BF0138359 for ; Fri, 24 Jul 2020 20:33:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0575AE0863; Fri, 24 Jul 2020 20:33:31 +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 E0B2EE0863 for ; Fri, 24 Jul 2020 20:33:30 +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 8AC6F34EF80 for ; Fri, 24 Jul 2020 20:33:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F2DB429A for ; Fri, 24 Jul 2020 20:33:27 +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: <1595597633.9f8dec72a371f7b60af1b1669d112c0d5c13b728.dilfridge@gentoo> Subject: [gentoo-commits] proj/catalyst:catalyst-3.0-stable 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: 9f8dec72a371f7b60af1b1669d112c0d5c13b728 X-VCS-Branch: catalyst-3.0-stable Date: Fri, 24 Jul 2020 20:33:27 +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: 81d44450-3364-40cd-9e95-13f570636a82 X-Archives-Hash: e81c525c881a93024e54650e95ff89a7 commit: 9f8dec72a371f7b60af1b1669d112c0d5c13b728 Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Jul 24 12:35:09 2020 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Jul 24 13:33:53 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9f8dec72 stagebase: Extend cleanup logic to more directories Needed for FEATURES management (switching off pid namespaces in qemu) and for testing build system hacks (like building python single-threaded to avoid hangs). Signed-off-by: Andreas K. Hüttel gentoo.org> catalyst/base/stagebase.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 0ddd359f..afeda722 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1253,13 +1253,19 @@ class StageBase(TargetBase, ClearBase, GenBase): if ("portage_prefix" in self.settings and "sticky-config" not in self.settings["options"]): log.debug("clean(), portage_preix = %s, no sticky-config", self.settings["portage_prefix"]) - for _dir in "accept_keywords", "keywords", "mask", "unmask", "use": + for _dir in "package.accept_keywords", "package.keywords", "package.mask", "package.unmask", "package.use", "package.env", "env": target = pjoin(self.settings["destpath"], - "etc/portage/package.%s" % _dir, + "etc/portage/%s" % _dir, self.settings["portage_prefix"]) log.notice("Clearing portage_prefix target: %s", target) clear_path(target) + # Remove hacks that should *never* go into stages + target = pjoin(self.settings["destpath"], "etc/portage/patches") + if os.path.exists(target): + log.warning("You've been hacking. Clearing target patches: %s", target) + clear_path(target) + # Remove our overlay overlay = normpath(self.settings["chroot_path"] + self.settings["local_overlay"]) if os.path.exists(overlay):