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 B3D4E1387FD for ; Thu, 11 Sep 2014 04:01:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34255E0A62; Thu, 11 Sep 2014 04:01:17 +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 A431CE0A4F for ; Thu, 11 Sep 2014 04:01:16 +0000 (UTC) Received: from big_daddy.dol-sen.ca (S010600222de111ff.vc.shawcable.net [96.49.5.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id C1C273401BE for ; Thu, 11 Sep 2014 04:01:15 +0000 (UTC) From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH 3/6] Rename a make.conf key to make_conf due to bash variable name restrictions Date: Wed, 10 Sep 2014 21:01:05 -0700 Message-Id: <1410408068-3441-4-git-send-email-dolsen@gentoo.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1410408068-3441-1-git-send-email-dolsen@gentoo.org> References: <1410408068-3441-1-git-send-email-dolsen@gentoo.org> 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-Archives-Salt: 24775667-2108-4900-8d80-c47d2d708148 X-Archives-Hash: b43eb5c2d8e70664ec8184a9f60353ae --- 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", -- 2.1.0