From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2CD10138A87 for ; Thu, 26 Feb 2015 04:12:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A3A6E0A6C; Thu, 26 Feb 2015 04:12:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 592A2E0A65 for ; Thu, 26 Feb 2015 04:12:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 669FD340BF9 for ; Thu, 26 Feb 2015 04:12:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 992631291F for ; Thu, 26 Feb 2015 04:12:03 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1420091886.6f01be26fb22e2b9c89453f9a4d2eeba2babf6e6.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/defaults.py X-VCS-Directories: catalyst/ catalyst/base/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 6f01be26fb22e2b9c89453f9a4d2eeba2babf6e6 X-VCS-Branch: master Date: Thu, 26 Feb 2015 04:12:03 +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: 766dc048-845c-4f25-9c81-646d9c77195c X-Archives-Hash: 3a160a1e323731b3768ae65332c4eced Message-ID: <20150226041203.Bj4xV3aBens4UBp9QkQEcQFXTciwkwVlQNcZLCK7QGY@z> commit: 6f01be26fb22e2b9c89453f9a4d2eeba2babf6e6 Author: Brian Dolbec gentoo org> AuthorDate: Tue Jan 22 08:39:18 2013 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 1 05:58:06 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=6f01be26 Rename a make.conf key to make_conf due to bash variable name restrictions --- catalyst/base/stagebase.py | 10 +++++----- catalyst/defaults.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index b44a957..96b1c19 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1020,7 +1020,7 @@ class StageBase(TargetBase, ClearBase, GenBase): def chroot_setup(self): self.makeconf=read_makeconf(normpath(self.settings["chroot_path"]+ - self.settings["make.conf"])) + self.settings["make_conf"])) self.override_cbuild() self.override_chost() self.override_cflags() @@ -1068,7 +1068,7 @@ class StageBase(TargetBase, ClearBase, GenBase): """ Modify and write out make.conf (for the chroot) """ makepath = normpath(self.settings["chroot_path"] + - self.settings["make.conf"]) + self.settings["make_conf"]) cmd("rm -f " + makepath,\ "Could not remove " + makepath, env=self.env) myf=open(makepath, "w") @@ -1122,9 +1122,9 @@ class StageBase(TargetBase, ClearBase, GenBase): myf.close() makepath = normpath(self.settings["chroot_path"] + - self.settings["make.conf"]) + self.settings["make_conf"]) cmd("cp " + makepath + " " + makepath + ".catalyst",\ - "Could not backup " + self.settings["make.conf"],env=self.env) + "Could not backup " + self.settings["make_conf"],env=self.env) touch(self.settings["autoresume_path"]+"chroot_setup") def fsscript(self): @@ -1172,7 +1172,7 @@ class StageBase(TargetBase, ClearBase, GenBase): cmd("rm -rf " + self.settings["chroot_path"] + self.settings["local_overlay"], "Could not remove " + self.settings["local_overlay"], env=self.env) cmd("sed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\ - "/etc/portage/make.conf",\ + self.settings["make_conf"],\ "Could not remove PORTDIR_OVERLAY from make.conf",env=self.env) """ Clean up old and obsoleted files in /etc """ diff --git a/catalyst/defaults.py b/catalyst/defaults.py index ce7e919..2839a3d 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -25,8 +25,8 @@ confdefaults={ "hash_function": "crc32", "icecream": "/var/cache/icecream", "local_overlay": "/usr/local/portage", - "make.conf": "/etc/portage/make.conf", - "options": "", + "make_conf": "/etc/portage/make.conf", + "options": set(), "packagedir": "/usr/portage/packages", "portdir": "/usr/portage", "port_tmpdir": "/var/tmp/portage",