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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CBCE3158020 for ; Mon, 14 Nov 2022 00:36:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7193E08F0; Mon, 14 Nov 2022 00:36:48 +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 AAB76E08F0 for ; Mon, 14 Nov 2022 00:36:48 +0000 (UTC) Received: (nullmailer pid 81806 invoked by uid 1000); Mon, 14 Nov 2022 00:36:43 -0000 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= To: gentoo-catalyst@lists.gentoo.org Cc: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Subject: [gentoo-catalyst] [PATCH] stagebase: Also clean out profile/package.use.force profile/package.use.mask Date: Mon, 14 Nov 2022 01:36:22 +0100 Message-Id: <20221114003622.81795-1-dilfridge@gentoo.org> X-Mailer: git-send-email 2.37.4 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: 4556f35c-8b6a-42cf-a1b5-8a148e374f34 X-Archives-Hash: 55632e6ba056185bb38f21ec4cef586c Signed-off-by: Andreas K. Hüttel --- catalyst/base/stagebase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index bcf596ae..5a3bd375 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1230,7 +1230,7 @@ class StageBase(TargetBase, ClearBase, GenBase): "sticky-config" not in self.settings["options"]): log.debug("clean(), portage_preix = %s, no sticky-config", self.settings["portage_prefix"]) - for _dir in "package.accept_keywords", "package.keywords", "package.mask", "package.unmask", "package.use", "package.env", "env": + for _dir in "package.accept_keywords", "package.keywords", "package.mask", "package.unmask", "package.use", "package.env", "env", "profile/package.use.force", "profile/package.use.mask": target = pjoin(self.settings["stage_path"], "etc/portage/%s" % _dir, self.settings["portage_prefix"]) -- 2.37.4