diff options
| author |   Ross Burton <ross.burton@intel.com> | 2014-12-01 20:50:14 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-03 12:13:32 +0000 |
| commit | 2800958dadaa5c055ba21d52c98d842d360f0785 (patch) | |
| tree | 70753e387f5eb78cc352645866230bdaa9e66dde /lib | |
| parent | c52841445d8db8f84c4da34203b195fea5874247 (diff) | |
| download | bitbake-2800958dadaa5c055ba21d52c98d842d360f0785.tar.gz | |
data: rename defaultval to _defaultval
The defaultval field is intended to be internal and the only use of that field
outside of data.py is to skip over it when iterating over a value's flags.
For clarity and convenience, rename the field to _defaultval so that it is
considered internal and not exposed through the data API.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bb/data_smart.py | 6 | ||||
| -rw-r--r-- | lib/bb/parse/ast.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py index 9a42a1706..31ce9a5d1 100644 --- a/lib/bb/data_smart.py +++ b/lib/bb/data_smart.py @@ -589,7 +589,7 @@ class DataSmart(MutableMapping): self._makeShadowCopy(var) self.dict[var][flag] = value - if flag == "defaultval" and '_' in var: + if flag == "_defaultval" and '_' in var: self._setvar_update_overrides(var) if flag == "unexport" or flag == "export": @@ -605,8 +605,8 @@ class DataSmart(MutableMapping): if local_var is not None: if flag in local_var: value = copy.copy(local_var[flag]) - elif flag == "_content" and "defaultval" in local_var and not noweakdefault: - value = copy.copy(local_var["defaultval"]) + elif flag == "_content" and "_defaultval" in local_var and not noweakdefault: + value = copy.copy(local_var["_defaultval"]) if expand and value: # Only getvar (flag == _content) hits the expand cache cachename = None diff --git a/lib/bb/parse/ast.py b/lib/bb/parse/ast.py index 4e5a06e76..af42a0c0d 100644 --- a/lib/bb/parse/ast.py +++ b/lib/bb/parse/ast.py @@ -128,7 +128,7 @@ class DataNode(AstNode): if 'flag' in groupd and groupd['flag'] != None: flag = groupd['flag'] elif groupd["lazyques"]: - flag = "defaultval" + flag = "_defaultval" loginfo['op'] = op loginfo['detail'] = groupd["value"] |