Wow. I need to make sure that we actually comment comments in make.conf or we end...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1304 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 09e4fb44bfd9cc5a3cea962d3ddfc0713db05ee8..392d2f2e4fc75b96f18d7603fdc31dcfa93a1550 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  modules/generic_stage_target.py:
+  Wow. I need to make sure that we actually comment comments in make.conf or
+  we end up with a failed build. Thanks to Christian Heim <phreak@gentoo.org>
+  for pointing it out. This is catalyst 2.0.6_pre6 for testing.
+
   14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/stage1/stage1-chroot.sh, targets/stage2/stage2-chroot.sh,
   targets/stage3/stage3-chroot.sh:

diff --git a/catalyst b/catalyst
index 6914f4d51d7f1174b0bb5b55c33cbabab21187eb..558405fb3eff0de60a1bb40d239f86e391392f07 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.6_pre5"
+__version__="2.0.6_pre6"
 
 conf_values={}
 

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 96ad3dcbcf7379f7b98251286a55618e733fd2fd..bfc9299d4f801714966909331833da52f6f17142 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1071,7 +1071,7 @@ class generic_stage_target(generic_target):
                                myusevars.extend(self.settings["use"])
 
                        if myusevars:
-                               myf.write("# These are the USE flags that were used in addition to what is provided by the\nprofile used for building.\n")
+                               myf.write("# These are the USE flags that were used in addition to what is provided by the\n# profile used for building.\n")
                                myusevars = sorted(set(myusevars))
                                myf.write('USE="'+string.join(myusevars)+'"\n')