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 C921A1382C5 for ; Thu, 22 Feb 2018 03:50:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01726E07FE; Thu, 22 Feb 2018 03:50:58 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 D4D52E07FE for ; Thu, 22 Feb 2018 03:50:57 +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 3A0F5335C0C for ; Thu, 22 Feb 2018 03:50:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC700211 for ; Thu, 22 Feb 2018 03:50:54 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1519271094.6dce47a175ec2508eac1e04e5df42efc58baf398.zerochaos@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: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 6dce47a175ec2508eac1e04e5df42efc58baf398 X-VCS-Branch: master Date: Thu, 22 Feb 2018 03:50:54 +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-Archives-Salt: 3d7a9974-3348-4a69-b3f9-52c558506fd8 X-Archives-Hash: c9acc08ab00ec7ecb879441756371299 commit: 6dce47a175ec2508eac1e04e5df42efc58baf398 Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Thu Feb 22 03:44:54 2018 +0000 Commit: Richard Farina gentoo org> CommitDate: Thu Feb 22 03:44:54 2018 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6dce47a1 do not rewrite make.conf if sticky-config is set we don't want to re-write the user's make.conf if sticky-config is set, it may have been modified during fsscript and the user asked for their config to be preserved catalyst/base/stagebase.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index eaed73fc..c249295a 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1231,8 +1231,9 @@ class StageBase(TargetBase, ClearBase, GenBase): if os.path.exists(overlay): clear_path(overlay) - # re-write the make.conf to be sure it is clean - self.write_make_conf(setup=False) + 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) # Clean up old and obsoleted files in /etc if os.path.exists(self.settings["stage_path"]+"/etc"):