From: Brian Dolbec <dolsen@gentoo.org>
Date: Fri, 25 Jan 2013 04:00:24 +0000 (-0800)
Subject: Extend ParserBase to do variable substitution.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c5dd4b3807ca161e4db10ba15d15728d9b4a3a78;p=catalyst.git

Extend ParserBase to do variable substitution.

Also add embedded variable substitiution to default settings.
Why are we not using python's built-in ConfigParser?
We'll migrate it later.
---

diff --git a/catalyst/config.py b/catalyst/config.py
index 0da1eb8e..c952648c 100644
--- a/catalyst/config.py
+++ b/catalyst/config.py
@@ -67,6 +67,9 @@ class ParserBase:
 				# Start a new array using the first element of mobjs
 				cur_array = [mobjs[0]]
 				if mobjs[1]:
+					# do any variable substitiution embeded in it with
+					# the values already obtained
+					mobjs[1] = mobjs[1] % values
 					if self.multiple_values:
 						# split on white space creating additional array elements
 #						subarray = white_space.split(mobjs[1])
diff --git a/catalyst/main.py b/catalyst/main.py
index db181821..043681e5 100755
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -116,7 +116,6 @@ def parse_config(myconfig):
 	# add our python base directory to use for loading target arch's
 	conf_values["PythonDir"] = __selfpath__
 
-
 	# print out any options messages
 	for opt in conf_values['options']:
 		if opt in option_messages:
@@ -133,6 +132,11 @@ def parse_config(myconfig):
 	if "envscript" in myconf:
 		print "Envscript support enabled."
 
+	# take care of any variable substitutions that may be left
+	for x in list(conf_values):
+		if isinstance(conf_values[x], str):
+			conf_values[x] = conf_values[x] % conf_values
+
 
 def import_module(target):
 	"""