From b92ec90ea40639d79c491f5a0b5a0f3e4dfa6708 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 1 Dec 2014 20:50:14 +0000 Subject: bitbake: 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. (Bitbake rev: 2800958dadaa5c055ba21d52c98d842d360f0785) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- bitbake/lib/bb/data_smart.py | 6 +++--- bitbake/lib/bb/parse/ast.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 9a42a17062..31ce9a5d15 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/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/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index 4e5a06e761..af42a0c0d6 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/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"] -- cgit v1.2.3-54-g00ecf