summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-25 09:57:29 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-25 09:57:29 +0000
commit0da3c82a66e02bf2d3780e23427d476766a0bcfc (patch)
treee3401f2712d5f085227240e1458ec409bc91db29 /bitbake
parenteee1508e19a9cf2cbe906c40dff5844a17d0b660 (diff)
downloadpoky-0da3c82a66e02bf2d3780e23427d476766a0bcfc.tar.gz
bitbake/lib/bb/data.py: Add unexport flag for variables, add speedup for expandKeys
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@956 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/data.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 819dff9679..19066c9adc 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -271,6 +271,9 @@ def expandKeys(alterdata, readdata = None):
271 readdata = alterdata 271 readdata = alterdata
272 272
273 for key in keys(alterdata): 273 for key in keys(alterdata):
274 if not '${' in key:
275 continue
276
274 ekey = expand(key, readdata) 277 ekey = expand(key, readdata)
275 if key == ekey: 278 if key == ekey:
276 continue 279 continue
@@ -370,6 +373,9 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False):
370# NOTE: should probably check for unbalanced {} within the var 373# NOTE: should probably check for unbalanced {} within the var
371 o.write("%s() {\n%s\n}\n" % (varExpanded, val)) 374 o.write("%s() {\n%s\n}\n" % (varExpanded, val))
372 else: 375 else:
376 if getVarFlag(var, "unexport", d):
377 o.write('unset %s\n' % varExpanded)
378 return 1
373 if getVarFlag(var, "export", d): 379 if getVarFlag(var, "export", d):
374 o.write('export ') 380 o.write('export ')
375 else: 381 else: