Added a patch from Mike Frysinger <vapier@gentoo.org> for bug #173740 to cause cataly...

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

diff --git a/ChangeLog b/ChangeLog
index afc9d3e39a2fed879798b7a5e8bb7e47b77fe5f8..48fa771c057bb1588d641fc7c93dc98092dfccc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  10 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  modules/generic_stage_target.py:
+  Added a patch from Mike Frysinger <vapier@gentoo.org> for bug #173740 to
+  cause catalyst to export boolean variables as well as string-based
+  variables.
+
   10 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/generic_stage_target.py:
   Fixing check for invalid subarch to not filter too much. Fix from Mike

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 97ce88fefa7853f5d8f0668cc0032414915f4c5b..59dd37faf8ea3b1be6b5b99f567548992218506d 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1057,8 +1057,7 @@ class generic_stage_target(generic_target):
                # fixed. We need this to use the os.system() call since we can't
                # specify our own environ:
                for x in self.settings.keys():
-                       # "/" is replaced with "_", "-" is replaced with "_", and "." is
-                       # replaced with "_"
+                       # sanitize var names by doing "s|/-.|_|g"
                        varname="clst_"+string.replace(x,"/","_")
                        varname=string.replace(varname,"-","_")
                        varname=string.replace(varname,".","_")
@@ -1069,6 +1068,11 @@ class generic_stage_target(generic_target):
                        elif type(self.settings[x])==types.ListType:
                                #os.environ[varname]=string.join(self.settings[x])
                                self.env[varname]=string.join(self.settings[x])
+                       elif type(self.settings[x])==types.BooleanType:
+                               if self.settings[x]:
+                                       self.env[varname]="true"
+                               else:
+                                       self.env[varname]="false"
                if self.settings.has_key("makeopts"):
                        self.env["MAKEOPTS"]=self.settings["makeopts"]