From 033068d42914ab6f3450020044d30343f4a735b2 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sat, 5 Apr 2008 16:34:42 +0000 Subject: run sed on copied make.conf to remove lines that start with ## git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/trunk@1890 f8877401-5920-0410-a79b-8e2d7e04ca0d --- ChangeLog | 4 ++++ src/GLIArchitectureTemplate.py | 2 ++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index cce6e9c..097498f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 2005-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 05 Apr 2008; Andrew Gaffney + src/GLIArchitectureTemplate.py: + run sed on copied make.conf to remove lines that start with ## + 04 Apr 2008; Andrew Gaffney src/Partitioning.py: Modify order of extended check in partitioning code so that it works diff --git a/src/GLIArchitectureTemplate.py b/src/GLIArchitectureTemplate.py index 0d37fcb..88cd94c 100644 --- a/src/GLIArchitectureTemplate.py +++ b/src/GLIArchitectureTemplate.py @@ -414,6 +414,8 @@ class ArchitectureTemplate: self._portage.copy_pkg_to_chroot(pkg, True, ignore_missing=True) self.notify_frontend("progress", (float(syspkglen) / (syspkglen+1), "Finishing")) GLIUtility.spawn("cp /etc/make.conf " + self._chroot_dir + "/etc/make.conf") + # Remove warning from make.conf + GLIUtility.spawn("sed -i '/^##/d' " + self._chroot_dir + "/etc/make.conf") GLIUtility.spawn("ln -s `readlink /etc/make.profile` " + self._chroot_dir + "/etc/make.profile") GLIUtility.spawn("cp -f /etc/inittab.old " + self._chroot_dir + "/etc/inittab") -- cgit v1.2.3-65-gdbad