diff options
| author |   Andrew Gaffney <agaffney@gentoo.org> | 2008-04-05 16:34:42 +0000 |
|---|---|---|
| committer | Andrew Gaffney <agaffney@gentoo.org> | 2008-04-05 16:34:42 +0000 |
| commit | 033068d42914ab6f3450020044d30343f4a735b2 (patch) | |
| tree | 9f25ebcf816fca646ae26348f9284e1d4b3ab2f1 | |
| parent | Modify order of extended check in partitioning code so that it works (diff) | |
| download | gli-033068d42914ab6f3450020044d30343f4a735b2.tar.gz gli-033068d42914ab6f3450020044d30343f4a735b2.tar.bz2 gli-033068d42914ab6f3450020044d30343f4a735b2.zip | |
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
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/GLIArchitectureTemplate.py | 2 |
2 files changed, 6 insertions, 0 deletions
@@ -2,6 +2,10 @@ # Copyright 2005-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 05 Apr 2008; Andrew Gaffney <agaffney@gentoo.org> + src/GLIArchitectureTemplate.py: + run sed on copied make.conf to remove lines that start with ## + 04 Apr 2008; Andrew Gaffney <agaffney@gentoo.org> 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") |