From: Daniel Robbins Date: Tue, 11 Nov 2003 06:42:14 +0000 (+0000) Subject: make.conf handling simplification X-Git-Tag: CATALYST_1_0_1~163 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4e37100fe4c9be3d406606a7d3efd004035c88d5;p=catalyst.git make.conf handling simplification git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@77 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/modules/targets.py b/modules/targets.py index b6dc1034..08ab5cde 100644 --- a/modules/targets.py +++ b/modules/targets.py @@ -156,8 +156,7 @@ class generic_stage_target(generic_target): def chroot_setup(self): cmd("cp /etc/resolv.conf "+self.settings["chroot_path"]+"/etc","Could not copy resolv.conf into place.") - if os.path.exists(self.settings["chroot_path"]+"/etc/make.conf"): - cmd("mv "+self.settings["chroot_path"]+"/etc/make.conf "+self.settings["chroot_path"]+"/etc/make.conf.orig") + cmd("rm -f "+self.settings["chroot_path"]+"/etc/make.conf") myf=open(self.settings["chroot_path"]+"/etc/make.conf","w") myf.write("# These settings were set by the catalyst build script that automatically built this stage\n")