summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/parse
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-04-01 15:04:49 +0000
committerRichard Purdie <richard@openedhand.com>2007-04-01 15:04:49 +0000
commit7371e6323c3fb6b0545712e3cf84606644073e77 (patch)
treee08f25669ec0f0e9d11334909f3b68c0ab6aca19 /bitbake/lib/bb/parse
parent8b36dc217443aeeec8493d39561d2bb010336774 (diff)
downloadpoky-7371e6323c3fb6b0545712e3cf84606644073e77.tar.gz
bitbake: Update to 1.8.1 (inc. various bug fixes, epoch support)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1419 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb/parse')
-rw-r--r--bitbake/lib/bb/parse/parse_py/ConfHandler.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index 1ae673079d..0e05928d84 100644
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -161,6 +161,12 @@ def handle(fn, data, include = 0):
161 return data 161 return data
162 162
163def feeder(lineno, s, fn, data): 163def feeder(lineno, s, fn, data):
164 def getFunc(groupd, key, data):
165 if 'flag' in groupd and groupd['flag'] != None:
166 return bb.data.getVarFlag(key, groupd['flag'], data)
167 else:
168 return bb.data.getVar(key, data)
169
164 m = __config_regexp__.match(s) 170 m = __config_regexp__.match(s)
165 if m: 171 if m:
166 groupd = m.groupdict() 172 groupd = m.groupdict()
@@ -168,19 +174,19 @@ def feeder(lineno, s, fn, data):
168 if "exp" in groupd and groupd["exp"] != None: 174 if "exp" in groupd and groupd["exp"] != None:
169 bb.data.setVarFlag(key, "export", 1, data) 175 bb.data.setVarFlag(key, "export", 1, data)
170 if "ques" in groupd and groupd["ques"] != None: 176 if "ques" in groupd and groupd["ques"] != None:
171 val = bb.data.getVar(key, data) 177 val = getFunc(groupd, key, data)
172 if val == None: 178 if val == None:
173 val = groupd["value"] 179 val = groupd["value"]
174 elif "colon" in groupd and groupd["colon"] != None: 180 elif "colon" in groupd and groupd["colon"] != None:
175 val = bb.data.expand(groupd["value"], data) 181 val = bb.data.expand(groupd["value"], data)
176 elif "append" in groupd and groupd["append"] != None: 182 elif "append" in groupd and groupd["append"] != None:
177 val = "%s %s" % ((bb.data.getVar(key, data) or ""), groupd["value"]) 183 val = "%s %s" % ((getFunc(groupd, key, data) or ""), groupd["value"])
178 elif "prepend" in groupd and groupd["prepend"] != None: 184 elif "prepend" in groupd and groupd["prepend"] != None:
179 val = "%s %s" % (groupd["value"], (bb.data.getVar(key, data) or "")) 185 val = "%s %s" % (groupd["value"], (getFunc(groupd, key, data) or ""))
180 elif "postdot" in groupd and groupd["postdot"] != None: 186 elif "postdot" in groupd and groupd["postdot"] != None:
181 val = "%s%s" % ((bb.data.getVar(key, data) or ""), groupd["value"]) 187 val = "%s%s" % ((getFunc(groupd, key, data) or ""), groupd["value"])
182 elif "predot" in groupd and groupd["predot"] != None: 188 elif "predot" in groupd and groupd["predot"] != None:
183 val = "%s%s" % (groupd["value"], (bb.data.getVar(key, data) or "")) 189 val = "%s%s" % (groupd["value"], (getFunc(groupd, key, data) or ""))
184 else: 190 else:
185 val = groupd["value"] 191 val = groupd["value"]
186 if 'flag' in groupd and groupd['flag'] != None: 192 if 'flag' in groupd and groupd['flag'] != None: