diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-11-25 09:57:29 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-11-25 09:57:29 +0000 |
| commit | 0da3c82a66e02bf2d3780e23427d476766a0bcfc (patch) | |
| tree | e3401f2712d5f085227240e1458ec409bc91db29 | |
| parent | eee1508e19a9cf2cbe906c40dff5844a17d0b660 (diff) | |
| download | openembedded-core-0da3c82a66e02bf2d3780e23427d476766a0bcfc.tar.gz openembedded-core-0da3c82a66e02bf2d3780e23427d476766a0bcfc.tar.bz2 openembedded-core-0da3c82a66e02bf2d3780e23427d476766a0bcfc.zip | |
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
| -rw-r--r-- | bitbake/lib/bb/data.py | 6 |
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): readdata = alterdata for key in keys(alterdata): + if not '${' in key: + continue + ekey = expand(key, readdata) if key == ekey: continue @@ -370,6 +373,9 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False): # NOTE: should probably check for unbalanced {} within the var o.write("%s() {\n%s\n}\n" % (varExpanded, val)) else: + if getVarFlag(var, "unexport", d): + o.write('unset %s\n' % varExpanded) + return 1 if getVarFlag(var, "export", d): o.write('export ') else: |