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 b6dc1034b34f319d819a5b314e081f7908996ca2..08ab5cde7220cadfa396bba8b09a8a682b367d41 100644 (file)
--- 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")