From 0385db55248f9288ae83164d3c5f52f04322eae0 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 14 Feb 2008 18:57:09 +0000 Subject: [PATCH] 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 for pointing it out. This is catalyst 2.0.6_pre6 for testing. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1304 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 ++++++ catalyst | 2 +- modules/generic_stage_target.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09e4fb44..392d2f2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 14 Feb 2008; Chris Gianelloni 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 + for pointing it out. This is catalyst 2.0.6_pre6 for testing. + 14 Feb 2008; Chris Gianelloni targets/stage1/stage1-chroot.sh, targets/stage2/stage2-chroot.sh, targets/stage3/stage3-chroot.sh: diff --git a/catalyst b/catalyst index 6914f4d5..558405fb 100755 --- a/catalyst +++ b/catalyst @@ -8,7 +8,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__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 96ad3dcb..bfc9299d 100644 --- 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') -- 2.26.2