diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2006-04-28 21:40:51 +0000 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2006-04-28 21:40:51 +0000 |
commit | 481141291a4e6bc0cfb2d6cb22d3c8f0762be43e (patch) | |
tree | 4d3fd5b01d84687a98be0cf8e3f45e4b3c191a0d /lib/bb/data.py | |
parent | 6d7d68d1c50d2d5abc09f00167310cd60fc58d8d (diff) | |
download | bitbake-481141291a4e6bc0cfb2d6cb22d3c8f0762be43e.tar.gz |
bitbake/lib/bb/data_smart.py:
Remove my broken COW version, use mithros COW module
instead. Make it 'work' with the code
bitbake/lib/bb/data.py:
Update to use the iter protocol again and has_key
Diffstat (limited to 'lib/bb/data.py')
-rw-r--r-- | lib/bb/data.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/bb/data.py b/lib/bb/data.py index fa38ee675..6ab1208f0 100644 --- a/lib/bb/data.py +++ b/lib/bb/data.py @@ -480,10 +480,10 @@ def update_data(d): l = len(o)+1 # see if one should even try - if not o in d._seen_overrides.__dict__: + if not d._seen_overrides.has_key(o): continue - vars = d._seen_overrides.__dict__[o] + vars = d._seen_overrides[o] for var in vars: name = var[:-l] try: @@ -492,8 +492,8 @@ def update_data(d): note ("Untracked delVar") # now on to the appends and prepends - if '_append' in d._special_values.__dict__: - appends = d._special_values.__dict__['_append'] or [] + if d._special_values.has_key('_append'): + appends = d._special_values['_append'] or [] for append in appends: for (a, o) in getVarFlag(append, '_append', d) or []: # maybe the OVERRIDE was not yet added so keep the append @@ -507,8 +507,8 @@ def update_data(d): setVar(append, sval, d) - if '_prepend' in d._special_values.__dict__: - prepends = d._special_values.__dict__['_prepend'] or [] + if d._special_values.has_key('_prepend'): + prepends = d._special_values['_prepend'] or [] for prepend in prepends: for (a, o) in getVarFlag(prepend, '_prepend', d) or []: |